diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vdc_db_query.php index 7644ef6d..61d1ed96 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vdc_db_query.php @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vicidial.php index 02c077a6..60054346 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
NOVA DISCAGEM MANUAL PARA :

Digite abaixo a informação do novo contato que você deseja ligar.
\n"; } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vdc_db_query.php index 3e367117..6c751024 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vdc_db_query.php @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vicidial.php index a9b0b888..bbd83c44 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
NEUE MANUELLE ADRESSE FÜR :

Tragen Sie unten die Informationen zu der neuen Adresse ein, die SIE wählen möchten.
\n"; } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vdc_db_query.php index d87d07e6..ce98d802 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vdc_db_query.php @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vicidial.php index 263f843a..233936f6 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
ΝΕΑ ΧΕΙΡΟΚΙΝΗΤΗ ΚΛΗΣΗ ΟΔΗΓΟΥ ΓΙΑ :

Καταχωρήστε τις πληροφορίες παρακάτω για τον νέο οδηγό που επιθυμήτε να καλέσετε.
\n"; } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vdc_db_query.php index 6e09a40f..cdb708b5 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vdc_db_query.php @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vicidial.php index f73c7217..b01cec5f 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
NUEVO PLOMO MANUAL DEL DIAL PARA :

Incorpore la información abajo para el nuevo plomo que usted desea llamar.
\n"; } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vdc_db_query.php index c6bfd79d..2556e2ed 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vdc_db_query.php @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vicidial.php index bc313c16..e0f7d21c 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
NOUVEL APPEL MANUEL VERS :

Nouveau prospect: remplissez le formulaire ci dessous.
\n"; } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vdc_db_query.php index bddc5156..48c8310d 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vdc_db_query.php @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vicidial.php index 2b8e6b4f..5cdc48fa 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
NUOVA CHIAMATA MANUALE PER IL CONTATTO :

Inserisci le informazioni per il nuovo contatto da chiamare.
\n"; } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vdc_db_query.php index 96817ca9..8af3097d 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vdc_db_query.php @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vicidial.php index 01d0a938..fdecc617 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
NIEUWE HANDMATIGE LEAD VOOR :

Voer de informatie voor de nieuwe te bellen lead hieronder in.
\n"; } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vdc_db_query.php index 51d8e832..148a3715 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vdc_db_query.php @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vicidial.php index be7be0b7..ca2f9ef7 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
NOWE RĘCZNE WYBIERANIE NUMERU DLA :

Wpisz poniżej informacje o kontakcie do którego chcesz wykonać połączenie.
\n"; } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vdc_db_query.php index 03b020f7..6d20c575 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vdc_db_query.php @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vicidial.php index 118e4cf7..16d7e9e6 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
LIGAÇÃO MANUAL NOVA DO SELETOR PARA :

Incorpore a informação abaixo para a ligação que nova você deseja se chamar.
\n"; } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vdc_db_query.php index c0a24560..84c137d2 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vdc_db_query.php @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vicidial.php index e86b91f9..4f74ef96 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
НОВЫЙ LEAD РУЧНОЙ НАБОР НОМЕРА ДЛЯ :

Ведите информацию ниже для нового lead который вы хотите вызвать.
\n"; } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vdc_db_query.php index d8d776e6..f628d84b 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vdc_db_query.php @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vicidial.php index bf553749..d59cfccb 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
NOVÉ manuálne vytáčanie pre zoznam kontaktov :

Zadajte nižšie uvedené informácie pre nový zoznam kontaktov, ktorý chcete volať.
\n"; } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vdc_db_query.php index 6b3c0d1b..1e3c904f 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vdc_db_query.php @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vicidial.php index f4fed316..dd858e9c 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
新的人工撥號紀錄給 :

請輸入下面的資訊給您想要外撥的新紀錄.
\n"; } diff --git a/agc_2-X/branches/agc_2.2.0/extras/MySQL_AST_CREATE_tables.sql b/agc_2-X/branches/agc_2.2.0/extras/MySQL_AST_CREATE_tables.sql index 9ecc2984..fccda7ef 100644 --- a/agc_2-X/branches/agc_2.2.0/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/branches/agc_2.2.0/extras/MySQL_AST_CREATE_tables.sql @@ -1913,7 +1913,7 @@ INSERT INTO vicidial_inbound_groups(group_id,group_name,group_color,active,queue INSERT INTO vicidial_lists SET list_id='999',list_name='Default inbound list',campaign_id='TESTCAMP',active='N'; INSERT INTO vicidial_lists SET list_id='998',list_name='Default Manual list',campaign_id='TESTCAMP',active='N'; -INSERT INTO system_settings (version,install_date) values('2.2.0rc1', CURDATE()); +INSERT INTO system_settings (version,install_date) values('2.2.0rc3', CURDATE()); INSERT INTO vicidial_status_categories (vsc_id,vsc_name) values('UNDEFINED','Default Category'); diff --git a/agc_2-X/branches/agc_2.2.0/extras/upgrade_2.2.0.sql b/agc_2-X/branches/agc_2.2.0/extras/upgrade_2.2.0.sql index fabd2eb8..24db89b3 100644 --- a/agc_2-X/branches/agc_2.2.0/extras/upgrade_2.2.0.sql +++ b/agc_2-X/branches/agc_2.2.0/extras/upgrade_2.2.0.sql @@ -734,4 +734,4 @@ CREATE TABLE vicidial_carrier_log_archive LIKE vicidial_carrier_log; UPDATE system_settings SET db_schema_version='1193',db_schema_update_date=NOW(); -UPDATE system_settings SET version='2.2.0rc1',db_schema_update_date=NOW(); +UPDATE system_settings SET version='2.2.0rc3',db_schema_update_date=NOW(); diff --git a/agc_2-X/branches/agc_2.2.0/version b/agc_2-X/branches/agc_2.2.0/version index bdc2ab64..005f88bc 100644 --- a/agc_2-X/branches/agc_2.2.0/version +++ b/agc_2-X/branches/agc_2.2.0/version @@ -1 +1 @@ -2.2.0rc1 +2.2.0rc3 diff --git a/agc_2-X/branches/agc_2.2.0/www/vicidial/AST_DIDstats.php b/agc_2-X/branches/agc_2.2.0/www/vicidial/AST_DIDstats.php index c7cde028..330dacf4 100644 --- a/agc_2-X/branches/agc_2.2.0/www/vicidial/AST_DIDstats.php +++ b/agc_2-X/branches/agc_2.2.0/www/vicidial/AST_DIDstats.php @@ -397,6 +397,18 @@ else $i++; } + ### Find default route + $default_route=''; + $stmt="select did_route from vicidial_inbound_dids where did_pattern='default';"; + $rslt=mysql_query($stmt, $link); + if ($DB) {echo "$stmt\n";} + $records_to_grab = mysql_num_rows($rslt); + if ($records_to_grab > 0) + { + $row=mysql_fetch_row($rslt); + $default_route = $row[0]; + } + ################################################### ### TOTALS DID SUMMARY SECTION ### if (strlen($extension[0]) > 0) @@ -413,6 +425,9 @@ else $d=0; while ($d < $stats_array_ct) { + $stat_description = ' *** default *** '; + $stat_route = $default_route; + $stat_record_array = explode(' ',$stats_array[$d]); $stat_count = ($stat_record_array[0] + 0); $stat_pattern = $stat_record_array[1]; 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 7644ef6d..61d1ed96 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 @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/trunk/LANG_www/agc_br/vdc_script_display.php b/agc_2-X/trunk/LANG_www/agc_br/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/trunk/LANG_www/agc_br/vdc_script_display.php +++ b/agc_2-X/trunk/LANG_www/agc_br/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); 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 02c077a6..60054346 100644 --- a/agc_2-X/trunk/LANG_www/agc_br/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_br/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
NOVA DISCAGEM MANUAL PARA :

Digite abaixo a informação do novo contato que você deseja ligar.
\n"; } 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 3e367117..6c751024 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 @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/trunk/LANG_www/agc_de/vdc_script_display.php b/agc_2-X/trunk/LANG_www/agc_de/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/trunk/LANG_www/agc_de/vdc_script_display.php +++ b/agc_2-X/trunk/LANG_www/agc_de/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); 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 a9b0b888..bbd83c44 100644 --- a/agc_2-X/trunk/LANG_www/agc_de/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_de/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
NEUE MANUELLE ADRESSE FÜR :

Tragen Sie unten die Informationen zu der neuen Adresse ein, die SIE wählen möchten.
\n"; } 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 d87d07e6..ce98d802 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 @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/trunk/LANG_www/agc_el/vdc_script_display.php b/agc_2-X/trunk/LANG_www/agc_el/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/trunk/LANG_www/agc_el/vdc_script_display.php +++ b/agc_2-X/trunk/LANG_www/agc_el/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); 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 263f843a..233936f6 100644 --- a/agc_2-X/trunk/LANG_www/agc_el/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_el/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
ΝΕΑ ΧΕΙΡΟΚΙΝΗΤΗ ΚΛΗΣΗ ΟΔΗΓΟΥ ΓΙΑ :

Καταχωρήστε τις πληροφορίες παρακάτω για τον νέο οδηγό που επιθυμήτε να καλέσετε.
\n"; } 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 6e09a40f..cdb708b5 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 @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/trunk/LANG_www/agc_es/vdc_script_display.php b/agc_2-X/trunk/LANG_www/agc_es/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/trunk/LANG_www/agc_es/vdc_script_display.php +++ b/agc_2-X/trunk/LANG_www/agc_es/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); 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 f73c7217..b01cec5f 100644 --- a/agc_2-X/trunk/LANG_www/agc_es/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_es/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
NUEVO PLOMO MANUAL DEL DIAL PARA :

Incorpore la información abajo para el nuevo plomo que usted desea llamar.
\n"; } 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 c6bfd79d..2556e2ed 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 @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/trunk/LANG_www/agc_fr/vdc_script_display.php b/agc_2-X/trunk/LANG_www/agc_fr/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/trunk/LANG_www/agc_fr/vdc_script_display.php +++ b/agc_2-X/trunk/LANG_www/agc_fr/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); 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 bc313c16..e0f7d21c 100644 --- a/agc_2-X/trunk/LANG_www/agc_fr/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_fr/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
NOUVEL APPEL MANUEL VERS :

Nouveau prospect: remplissez le formulaire ci dessous.
\n"; } 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 bddc5156..48c8310d 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 @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/trunk/LANG_www/agc_it/vdc_script_display.php b/agc_2-X/trunk/LANG_www/agc_it/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/trunk/LANG_www/agc_it/vdc_script_display.php +++ b/agc_2-X/trunk/LANG_www/agc_it/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); 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 2b8e6b4f..5cdc48fa 100644 --- a/agc_2-X/trunk/LANG_www/agc_it/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_it/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
NUOVA CHIAMATA MANUALE PER IL CONTATTO :

Inserisci le informazioni per il nuovo contatto da chiamare.
\n"; } diff --git a/agc_2-X/trunk/LANG_www/agc_nl/vdc_db_query.php b/agc_2-X/trunk/LANG_www/agc_nl/vdc_db_query.php index 96817ca9..8af3097d 100644 --- a/agc_2-X/trunk/LANG_www/agc_nl/vdc_db_query.php +++ b/agc_2-X/trunk/LANG_www/agc_nl/vdc_db_query.php @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/trunk/LANG_www/agc_nl/vdc_script_display.php b/agc_2-X/trunk/LANG_www/agc_nl/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/trunk/LANG_www/agc_nl/vdc_script_display.php +++ b/agc_2-X/trunk/LANG_www/agc_nl/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); diff --git a/agc_2-X/trunk/LANG_www/agc_nl/vicidial.php b/agc_2-X/trunk/LANG_www/agc_nl/vicidial.php index 01d0a938..fdecc617 100644 --- a/agc_2-X/trunk/LANG_www/agc_nl/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_nl/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
NIEUWE HANDMATIGE LEAD VOOR :

Voer de informatie voor de nieuwe te bellen lead hieronder in.
\n"; } diff --git a/agc_2-X/trunk/LANG_www/agc_pl/vdc_db_query.php b/agc_2-X/trunk/LANG_www/agc_pl/vdc_db_query.php index 51d8e832..148a3715 100644 --- a/agc_2-X/trunk/LANG_www/agc_pl/vdc_db_query.php +++ b/agc_2-X/trunk/LANG_www/agc_pl/vdc_db_query.php @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/trunk/LANG_www/agc_pl/vdc_script_display.php b/agc_2-X/trunk/LANG_www/agc_pl/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/trunk/LANG_www/agc_pl/vdc_script_display.php +++ b/agc_2-X/trunk/LANG_www/agc_pl/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); diff --git a/agc_2-X/trunk/LANG_www/agc_pl/vicidial.php b/agc_2-X/trunk/LANG_www/agc_pl/vicidial.php index be7be0b7..ca2f9ef7 100644 --- a/agc_2-X/trunk/LANG_www/agc_pl/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_pl/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
NOWE RĘCZNE WYBIERANIE NUMERU DLA :

Wpisz poniżej informacje o kontakcie do którego chcesz wykonać połączenie.
\n"; } 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 03b020f7..6d20c575 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 @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/trunk/LANG_www/agc_pt/vdc_script_display.php b/agc_2-X/trunk/LANG_www/agc_pt/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/trunk/LANG_www/agc_pt/vdc_script_display.php +++ b/agc_2-X/trunk/LANG_www/agc_pt/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); 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 118e4cf7..16d7e9e6 100644 --- a/agc_2-X/trunk/LANG_www/agc_pt/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_pt/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
LIGAÇÃO MANUAL NOVA DO SELETOR PARA :

Incorpore a informação abaixo para a ligação que nova você deseja se chamar.
\n"; } diff --git a/agc_2-X/trunk/LANG_www/agc_ru/vdc_db_query.php b/agc_2-X/trunk/LANG_www/agc_ru/vdc_db_query.php index c0a24560..84c137d2 100644 --- a/agc_2-X/trunk/LANG_www/agc_ru/vdc_db_query.php +++ b/agc_2-X/trunk/LANG_www/agc_ru/vdc_db_query.php @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/trunk/LANG_www/agc_ru/vdc_script_display.php b/agc_2-X/trunk/LANG_www/agc_ru/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/trunk/LANG_www/agc_ru/vdc_script_display.php +++ b/agc_2-X/trunk/LANG_www/agc_ru/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); diff --git a/agc_2-X/trunk/LANG_www/agc_ru/vicidial.php b/agc_2-X/trunk/LANG_www/agc_ru/vicidial.php index e86b91f9..4f74ef96 100644 --- a/agc_2-X/trunk/LANG_www/agc_ru/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_ru/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
НОВЫЙ LEAD РУЧНОЙ НАБОР НОМЕРА ДЛЯ :

Ведите информацию ниже для нового lead который вы хотите вызвать.
\n"; } diff --git a/agc_2-X/trunk/LANG_www/agc_sk/vdc_db_query.php b/agc_2-X/trunk/LANG_www/agc_sk/vdc_db_query.php index d8d776e6..f628d84b 100644 --- a/agc_2-X/trunk/LANG_www/agc_sk/vdc_db_query.php +++ b/agc_2-X/trunk/LANG_www/agc_sk/vdc_db_query.php @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/trunk/LANG_www/agc_sk/vdc_script_display.php b/agc_2-X/trunk/LANG_www/agc_sk/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/trunk/LANG_www/agc_sk/vdc_script_display.php +++ b/agc_2-X/trunk/LANG_www/agc_sk/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); diff --git a/agc_2-X/trunk/LANG_www/agc_sk/vicidial.php b/agc_2-X/trunk/LANG_www/agc_sk/vicidial.php index bf553749..d59cfccb 100644 --- a/agc_2-X/trunk/LANG_www/agc_sk/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_sk/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
NOVÉ manuálne vytáčanie pre zoznam kontaktov :

Zadajte nižšie uvedené informácie pre nový zoznam kontaktov, ktorý chcete volať.
\n"; } diff --git a/agc_2-X/trunk/LANG_www/agc_tw/vdc_db_query.php b/agc_2-X/trunk/LANG_www/agc_tw/vdc_db_query.php index 6b3c0d1b..1e3c904f 100644 --- a/agc_2-X/trunk/LANG_www/agc_tw/vdc_db_query.php +++ b/agc_2-X/trunk/LANG_www/agc_tw/vdc_db_query.php @@ -230,12 +230,13 @@ # 100104-1509 - Fixed vicidial_log duplicate check to allow update if dup and logging update # 100109-0745 - Added alt_num_status for ALTNUM dialing status # 100109-1336 - Fixed Manual dial live call detection +# 100113-1949 - Fixed dispo_choice bug and added dispo_status to dispo URL call # -$version = '2.2.0-138'; -$build = '100109-1336'; +$version = '2.2.0-139'; +$build = '100113-1949'; $mel=1; # Mysql Error Log enabled = 1 -$mysql_log_count=296; +$mysql_log_count=300; $one_mysql_log=0; require("dbconnect.php"); @@ -2372,30 +2373,28 @@ if ($ACTION == 'manDiaLlookCaLL') $channel = $row[1]; $end_epoch = $row[2]; - ### Local channel hung up, check carrier log for error - if ($end_epoch > 1000) + ### Check carrier log for error + $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} + if ($DB) {echo "$stmt\n";} + $CL_mancall_ct = mysql_num_rows($rslt); + if ($CL_mancall_ct > 0) { - $stmt="SELECT dialstatus,hangup_cause FROM vicidial_carrier_log where uniqueid='$uniqueid' and server_ip='$server_ip' and channel='$channel' and dialstatus IN('BUSY','CHANUNAVAIL','CONGESTION') LIMIT 1;"; + $row=mysql_fetch_row($rslt); + $dialstatus =$row[0]; + $hangup_cause =$row[1]; + + $channel = $dialstatus . "-" . $hangup_cause; + + $call_output = "$uniqueid\n$channel\nERROR"; + $call_good++; + + ### Delete call record + $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; + if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00292',$user,$server_ip,$session_name,$one_mysql_log);} - if ($DB) {echo "$stmt\n";} - $CL_mancall_ct = mysql_num_rows($rslt); - if ($CL_mancall_ct > 0) - { - $row=mysql_fetch_row($rslt); - $dialstatus =$row[0]; - $hangup_cause =$row[1]; - $channel = $dialstatus . "-" . $hangup_cause; - - $call_output = "$uniqueid\n$channel\nERROR"; - $call_good++; - - ### Delete call record - $stmt="DELETE from vicidial_auto_calls where callerid='$MDnextCID';"; - if ($format=='debug') {echo "\n";} - $rslt=mysql_query($stmt, $link); - if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} - } + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00293',$user,$server_ip,$session_name,$one_mysql_log);} } } } @@ -2428,6 +2427,11 @@ if ($ACTION == 'manDiaLlookCaLL') $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00055',$user,$server_ip,$session_name,$one_mysql_log);} + $stmt="UPDATE call_log set uniqueid='$uniqueid',channel='$channel' where caller_code='$MDnextCID';"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00300',$user,$server_ip,$session_name,$one_mysql_log);} + echo "$call_output"; } else @@ -3537,6 +3541,12 @@ if ($stage == "end") $rslt=mysql_query($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00102',$user,$server_ip,$session_name,$one_mysql_log);} + ### update vicidial_carrier_log to match uniqueIDs + $beginUNIQUEID = preg_replace("/\..*/","",$uniqueid); + $stmt="UPDATE vicidial_carrier_log set uniqueid='$uniqueid' where lead_id='$lead_id' and uniqueid LIKE \"$beginUNIQUEID%\";"; + if ($format=='debug') {echo "\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00299',$user,$server_ip,$session_name,$one_mysql_log);} } } @@ -4325,73 +4335,73 @@ if ($ACTION == 'VDADcheckINCOMING') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } $VDCL_start_call_url = preg_replace('/^VAR/','',$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',"$lead_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',"$vendor_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--list_id--B--',"$list_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',"$phone_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',"$phone_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--title--B--',"$title",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--first_name--B--',"$first_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',"$middle_initial",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--last_name--B--',"$last_name",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address1--B--',"$address1",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address2--B--',"$address2",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--address3--B--',"$address3",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--city--B--',"$city",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--state--B--',"$state",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--province--B--',"$province",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',"$postal_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--country_code--B--',"$country_code",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--gender--B--',"$gender",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',"$date_of_birth",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',"$alt_phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--email--B--',"$email",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',"$security_phrase",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--comments--B--',"$comments",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user--B--',"$user",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--pass--B--',"$pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--campaign--B--',"$campaign",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',"$phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',"$original_phone_login",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',"$phone_pass",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fronter--B--',"$fronter",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--closer--B--',"$closer",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--group--B--',"$group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',"$channel_group",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',"$SQLdate",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--epoch--B--',"$epoch",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',"$uniqueid",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',"$customer_zap_channel",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',"$customer_server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',"$server_ip",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',"$SIPexten",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--session_id--B--',"$session_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--phone--B--',"$phone",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dispo--B--',"$dispo",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--source_id--B--',"$source_id",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--rank--B--',"$rank",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--owner--B--',"$owner",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',"$camp_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--in_script--B--',"$in_script",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--fullname--B--',"$fullname",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',"$user_custom_one",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$VDCL_start_call_url); - $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--lead_id--B--',urlencode(trim($lead_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_id--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--vendor_lead_code--B--',urlencode(trim($vendor_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--list_id--B--',urlencode(trim($list_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gmt_offset_now--B--',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_code--B--',urlencode(trim($phone_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_number--B--',urlencode(trim($phone_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--title--B--',urlencode(trim($title)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--first_name--B--',urlencode(trim($first_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--middle_initial--B--',urlencode(trim($middle_initial)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--last_name--B--',urlencode(trim($last_name)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address1--B--',urlencode(trim($address1)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address2--B--',urlencode(trim($address2)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--address3--B--',urlencode(trim($address3)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--city--B--',urlencode(trim($city)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--state--B--',urlencode(trim($state)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--province--B--',urlencode(trim($province)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--postal_code--B--',urlencode(trim($postal_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--country_code--B--',urlencode(trim($country_code)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--gender--B--',urlencode(trim($gender)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--date_of_birth--B--',urlencode(trim($date_of_birth)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--alt_phone--B--',urlencode(trim($alt_phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--email--B--',urlencode(trim($email)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--security_phrase--B--',urlencode(trim($security_phrase)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--comments--B--',urlencode(trim($comments)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user--B--',urlencode(trim($user)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--pass--B--',urlencode(trim($pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--campaign--B--',urlencode(trim($campaign)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_login--B--',urlencode(trim($phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--original_phone_login--B--',urlencode(trim($original_phone_login)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone_pass--B--',urlencode(trim($phone_pass)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fronter--B--',urlencode(trim($fronter)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--closer--B--',urlencode(trim($closer)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--group--B--',urlencode(trim($group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--channel_group--B--',urlencode(trim($channel_group)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SQLdate--B--',urlencode(trim($SQLdate)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--epoch--B--',urlencode(trim($epoch)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--uniqueid--B--',urlencode(trim($uniqueid)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_zap_channel--B--',urlencode(trim($customer_zap_channel)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--customer_server_ip--B--',urlencode(trim($customer_server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--server_ip--B--',urlencode(trim($server_ip)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--SIPexten--B--',urlencode(trim($SIPexten)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--session_id--B--',urlencode(trim($session_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--phone--B--',urlencode(trim($phone)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--parked_by--B--',urlencode(trim($parked_by)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dispo--B--',urlencode(trim($dispo)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_number--B--',urlencode(trim($dialed_number)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--dialed_label--B--',urlencode(trim($dialed_label)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--source_id--B--',urlencode(trim($source_id)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--rank--B--',urlencode(trim($rank)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--owner--B--',urlencode(trim($owner)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--camp_script--B--',urlencode(trim($camp_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--in_script--B--',urlencode(trim($in_script)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--fullname--B--',urlencode(trim($fullname)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_one--B--',urlencode(trim($user_custom_one)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_two--B--',urlencode(trim($user_custom_two)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_three--B--',urlencode(trim($user_custom_three)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_four--B--',urlencode(trim($user_custom_four)),$VDCL_start_call_url); + $VDCL_start_call_url = eregi_replace('--A--user_custom_five--B--',urlencode(trim($user_custom_five)),$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time--B--',"0",$VDCL_start_call_url); $VDCL_start_call_url = eregi_replace('--A--talk_time_min--B--',"0",$VDCL_start_call_url); if ($DB > 0) {echo "$VDCL_start_call_url
\n";} @@ -4577,8 +4587,7 @@ if ($ACTION == 'userLOGout') if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00138',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); - $i=0; - while ($i < $qm_conf_ct) + if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $enable_queuemetrics_logging = $row[0]; @@ -4588,7 +4597,6 @@ if ($ACTION == 'userLOGout') $queuemetrics_pass = $row[4]; $queuemetrics_log_id = $row[5]; $allow_sipsak_messages = $row[6]; - $i++; } ##### END QUEUEMETRICS LOGGING LOOKUP ##### ########################################### @@ -5154,7 +5162,7 @@ if ($ACTION == 'updateDISPO') $status_name = $row[0]; } } - if (strlen($status_name) < 1) {$status_name = $dispo_chioce;} + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} ### connect to your vtiger database $linkV=mysql_connect("$vtiger_server_ip", "$vtiger_login","$vtiger_pass"); @@ -5537,11 +5545,11 @@ if ($ACTION == 'updateDISPO') if ($VUC_ct > 0) { $row=mysql_fetch_row($rslt); - $user_custom_one = $row[0]; - $user_custom_two = $row[1]; - $user_custom_three = $row[2]; - $user_custom_four = $row[3]; - $user_custom_five = $row[4]; + $user_custom_one = urlencode(trim($row[0])); + $user_custom_two = urlencode(trim($row[1])); + $user_custom_three = urlencode(trim($row[2])); + $user_custom_four = urlencode(trim($row[3])); + $user_custom_five = urlencode(trim($row[4])); } } @@ -5571,6 +5579,38 @@ if ($ACTION == 'updateDISPO') } } + if (eregi('--A--dispo_name--B--',$dispo_call_url)) + { + ### find the full status name for this status + $stmt = "select status_name from vicidial_statuses where status='$dispo_choice';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00297',$user,$server_ip,$session_name,$one_mysql_log);} + $vs_name_ct = mysql_num_rows($rslt); + if ($vs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + else + { + $stmt = "select status_name from vicidial_campaign_statuses where status='$dispo_choice' and campaign_id='$campaign';"; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00298',$user,$server_ip,$session_name,$one_mysql_log);} + $vcs_name_ct = mysql_num_rows($rslt); + if ($vcs_name_ct > 0) + { + $row=mysql_fetch_row($rslt); + $status_name = $row[0]; + } + } + if (strlen($status_name) < 1) {$status_name = $dispo_choice;} + } + $dispo_name = urlencode(trim($status_name)); + + + ##### grab the data from vicidial_list for the lead_id $stmt="SELECT lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner FROM vicidial_list where lead_id='$lead_id' LIMIT 1;"; $rslt=mysql_query($stmt, $link); @@ -5580,36 +5620,36 @@ if ($ACTION == 'updateDISPO') if ($list_lead_ct > 0) { $row=mysql_fetch_row($rslt); - $dispo = trim("$row[3]"); - $tsr = trim("$row[4]"); - $vendor_id = trim("$row[5]"); - $vendor_lead_code = trim("$row[5]"); - $source_id = trim("$row[6]"); - $list_id = trim("$row[7]"); - $gmt_offset_now = trim("$row[8]"); - $phone_code = trim("$row[10]"); - $phone_number = trim("$row[11]"); - $title = trim("$row[12]"); - $first_name = trim("$row[13]"); - $middle_initial = trim("$row[14]"); - $last_name = trim("$row[15]"); - $address1 = trim("$row[16]"); - $address2 = trim("$row[17]"); - $address3 = trim("$row[18]"); - $city = trim("$row[19]"); - $state = trim("$row[20]"); - $province = trim("$row[21]"); - $postal_code = trim("$row[22]"); - $country_code = trim("$row[23]"); - $gender = trim("$row[24]"); - $date_of_birth = trim("$row[25]"); - $alt_phone = trim("$row[26]"); - $email = trim("$row[27]"); - $security = trim("$row[28]"); - $comments = stripslashes(trim("$row[29]")); - $called_count = trim("$row[30]"); - $rank = trim("$row[32]"); - $owner = trim("$row[33]"); + $dispo = urlencode(trim($row[3])); + $tsr = urlencode(trim($row[4])); + $vendor_id = urlencode(trim($row[5])); + $vendor_lead_code = urlencode(trim($row[5])); + $source_id = urlencode(trim($row[6])); + $list_id = urlencode(trim($row[7])); + $gmt_offset_now = urlencode(trim($row[8])); + $phone_code = urlencode(trim($row[10])); + $phone_number = urlencode(trim($row[11])); + $title = urlencode(trim($row[12])); + $first_name = urlencode(trim($row[13])); + $middle_initial = urlencode(trim($row[14])); + $last_name = urlencode(trim($row[15])); + $address1 = urlencode(trim($row[16])); + $address2 = urlencode(trim($row[17])); + $address3 = urlencode(trim($row[18])); + $city = urlencode(trim($row[19])); + $state = urlencode(trim($row[20])); + $province = urlencode(trim($row[21])); + $postal_code = urlencode(trim($row[22])); + $country_code = urlencode(trim($row[23])); + $gender = urlencode(trim($row[24])); + $date_of_birth = urlencode(trim($row[25])); + $alt_phone = urlencode(trim($row[26])); + $email = urlencode(trim($row[27])); + $security = urlencode(trim($row[28])); + $comments = urlencode(trim($row[29])); + $called_count = urlencode(trim($row[30])); + $rank = urlencode(trim($row[32])); + $owner = urlencode(trim($row[33])); } $dispo_call_url = preg_replace('/^VAR/','',$dispo_call_url); @@ -5659,6 +5699,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = eregi_replace('--A--phone--B--',"$phone",$dispo_call_url); $dispo_call_url = eregi_replace('--A--parked_by--B--',"$parked_by",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dispo--B--',"$dispo",$dispo_call_url); + $dispo_call_url = eregi_replace('--A--dispo_name--B--',"$dispo_name",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_number--B--',"$dialed_number",$dispo_call_url); $dispo_call_url = eregi_replace('--A--dialed_label--B--',"$dialed_label",$dispo_call_url); $dispo_call_url = eregi_replace('--A--source_id--B--',"$source_id",$dispo_call_url); diff --git a/agc_2-X/trunk/LANG_www/agc_tw/vdc_script_display.php b/agc_2-X/trunk/LANG_www/agc_tw/vdc_script_display.php index 13775bab..7814428e 100644 --- a/agc_2-X/trunk/LANG_www/agc_tw/vdc_script_display.php +++ b/agc_2-X/trunk/LANG_www/agc_tw/vdc_script_display.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2010 Matt Florell LICENSE: AGPLv2 # # This script is designed display the contents of the SCRIPT tab in the agent interface # @@ -10,10 +10,11 @@ # 90827-1548 - Added list override script option # 91204-1913 - Added recording_filename and recording_id variables # 91211-1103 - Added user_custom_... variables +# 100116-0702 - Added preset variables # -$version = '2.2.0-4'; -$build = '91211-1103'; +$version = '2.2.0-5'; +$build = '100116-0702'; require("dbconnect.php"); @@ -143,7 +144,22 @@ if (isset($_GET["user_custom_four"])) {$user_custom_four=$_GET["user_custom_four elseif (isset($_POST["user_custom_four"])) {$user_custom_four=$_POST["user_custom_four"];} if (isset($_GET["user_custom_five"])) {$user_custom_five=$_GET["user_custom_five"];} elseif (isset($_POST["user_custom_five"])) {$user_custom_five=$_POST["user_custom_five"];} - +if (isset($_GET["preset_number_a"])) {$preset_number_a=$_GET["preset_number_a"];} + elseif (isset($_POST["preset_number_a"])) {$preset_number_a=$_POST["preset_number_a"];} +if (isset($_GET["preset_number_b"])) {$preset_number_b=$_GET["preset_number_b"];} + elseif (isset($_POST["preset_number_b"])) {$preset_number_b=$_POST["preset_number_b"];} +if (isset($_GET["preset_number_c"])) {$preset_number_c=$_GET["preset_number_c"];} + elseif (isset($_POST["preset_number_c"])) {$preset_number_c=$_POST["preset_number_c"];} +if (isset($_GET["preset_number_d"])) {$preset_number_d=$_GET["preset_number_d"];} + elseif (isset($_POST["preset_number_d"])) {$preset_number_d=$_POST["preset_number_d"];} +if (isset($_GET["preset_number_e"])) {$preset_number_e=$_GET["preset_number_e"];} + elseif (isset($_POST["preset_number_e"])) {$preset_number_e=$_POST["preset_number_e"];} +if (isset($_GET["preset_number_f"])) {$preset_number_f=$_GET["preset_number_f"];} + elseif (isset($_POST["preset_number_f"])) {$preset_number_f=$_POST["preset_number_f"];} +if (isset($_GET["preset_dtmf_a"])) {$preset_dtmf_a=$_GET["preset_dtmf_a"];} + elseif (isset($_POST["preset_dtmf_a"])) {$preset_dtmf_a=$_POST["preset_dtmf_a"];} +if (isset($_GET["preset_dtmf_b"])) {$preset_dtmf_b=$_GET["preset_dtmf_b"];} + elseif (isset($_POST["preset_dtmf_b"])) {$preset_dtmf_b=$_POST["preset_dtmf_b"];} if (isset($_GET["ScrollDIV"])) {$ScrollDIV=$_GET["ScrollDIV"];} elseif (isset($_POST["ScrollDIV"])) {$ScrollDIV=$_POST["ScrollDIV"];} if (isset($_GET["ignore_list_script"])) {$ignore_list_script=$_GET["ignore_list_script"];} @@ -316,6 +332,14 @@ if (eregi("iframe src",$script_text)) $user_custom_three = eregi_replace(' ','+',$user_custom_three); $user_custom_four = eregi_replace(' ','+',$user_custom_four); $user_custom_five = eregi_replace(' ','+',$user_custom_five); + $preset_number_a = eregi_replace(' ','+',$preset_number_a); + $preset_number_b = eregi_replace(' ','+',$preset_number_b); + $preset_number_c = eregi_replace(' ','+',$preset_number_c); + $preset_number_d = eregi_replace(' ','+',$preset_number_d); + $preset_number_e = eregi_replace(' ','+',$preset_number_e); + $preset_number_f = eregi_replace(' ','+',$preset_number_f); + $preset_dtmf_a = eregi_replace(' ','+',$preset_dtmf_a); + $preset_dtmf_b = eregi_replace(' ','+',$preset_dtmf_b); } $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text); @@ -381,6 +405,14 @@ $script_text = eregi_replace('--A--user_custom_two--B--',"$user_custom_two",$scr $script_text = eregi_replace('--A--user_custom_three--B--',"$user_custom_three",$script_text); $script_text = eregi_replace('--A--user_custom_four--B--',"$user_custom_four",$script_text); $script_text = eregi_replace('--A--user_custom_five--B--',"$user_custom_five",$script_text); +$script_text = eregi_replace('--A--preset_number_a--B--',"$preset_number_a",$script_text); +$script_text = eregi_replace('--A--preset_number_b--B--',"$preset_number_b",$script_text); +$script_text = eregi_replace('--A--preset_number_c--B--',"$preset_number_c",$script_text); +$script_text = eregi_replace('--A--preset_number_d--B--',"$preset_number_d",$script_text); +$script_text = eregi_replace('--A--preset_number_e--B--',"$preset_number_e",$script_text); +$script_text = eregi_replace('--A--preset_number_f--B--',"$preset_number_f",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_a--B--',"$preset_dtmf_a",$script_text); +$script_text = eregi_replace('--A--preset_dtmf_b--B--',"$preset_dtmf_b",$script_text); $script_text = eregi_replace("\n","
",$script_text); $script_text = stripslashes($script_text); diff --git a/agc_2-X/trunk/LANG_www/agc_tw/vicidial.php b/agc_2-X/trunk/LANG_www/agc_tw/vicidial.php index f4fed316..dd858e9c 100644 --- a/agc_2-X/trunk/LANG_www/agc_tw/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_tw/vicidial.php @@ -271,10 +271,11 @@ # 100107-0108 - Added dynamic screen size based on login screen browser dimensions # 100109-0801 - Added ALTNUM alt number status, fixed alt number dialing from setting # 100109-1338 - Fixed Manual dial live call detection +# 100116-0709 - Added presets to script and web form variables # -$version = '2.2.0-249'; -$build = '100109-1338'; +$version = '2.2.0-250'; +$build = '100116-0709'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -4982,6 +4983,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5070,6 +5078,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5379,6 +5394,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5467,6 +5489,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5577,6 +5606,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -5956,6 +5992,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6681,6 +6724,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6769,6 +6819,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -6862,6 +6919,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7036,6 +7100,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -7154,6 +7225,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} "&user_custom_three=" + VU_custom_three + '' + "&user_custom_four=" + VU_custom_four + '' + "&user_custom_five=" + VU_custom_five + '' + + "&preset_number_a=" + CalL_XC_a_NuMber + '' + + "&preset_number_b=" + CalL_XC_b_NuMber + '' + + "&preset_number_c=" + CalL_XC_c_NuMber + '' + + "&preset_number_d=" + CalL_XC_d_NuMber + '' + + "&preset_number_e=" + CalL_XC_e_NuMber + '' + + "&preset_dtmf_a=" + CalL_XC_a_Dtmf + '' + + "&preset_dtmf_b=" + CalL_XC_b_Dtmf + '' + webform_session; var regWFspace = new RegExp(" ","ig"); @@ -8735,11 +8813,11 @@ else var RGplus = new RegExp(" ","g"); var RGiframe = new RegExp("iframe","gi"); -var xtest; -xtest=unescape(encoded); -encoded=utf8_decode(xtest); + var xtest; + xtest=unescape(encoded); + encoded=utf8_decode(xtest); - if (scriptformat == 'YES') + if (scriptformat == 'YES') { var SCvendor_lead_code = document.vicidial_form.vendor_lead_code.value; var SCsource_id = source_id; @@ -8799,6 +8877,13 @@ encoded=utf8_decode(xtest); var SCuser_custom_three = VU_custom_three; var SCuser_custom_four = VU_custom_four; var SCuser_custom_five = VU_custom_five; + var SCpreset_number_a = CalL_XC_a_NuMber; + var SCpreset_number_b = CalL_XC_b_NuMber; + var SCpreset_number_c = CalL_XC_c_NuMber; + var SCpreset_number_d = CalL_XC_d_NuMber; + var SCpreset_number_e = CalL_XC_e_NuMber; + var SCpreset_dtmf_a = CalL_XC_a_Dtmf; + var SCpreset_dtmf_b = CalL_XC_b_Dtmf; var SCweb_vars = LIVE_web_vars; if (encoded.match(RGiframe)) @@ -8859,6 +8944,13 @@ encoded=utf8_decode(xtest); SCuser_custom_three = SCuser_custom_three.replace(RGplus,'+'); SCuser_custom_four = SCuser_custom_four.replace(RGplus,'+'); SCuser_custom_five = SCuser_custom_five.replace(RGplus,'+'); + SCpreset_number_a = SCpreset_number_a.replace(RGplus,'+'); + SCpreset_number_b = SCpreset_number_b.replace(RGplus,'+'); + SCpreset_number_c = SCpreset_number_c.replace(RGplus,'+'); + SCpreset_number_d = SCpreset_number_d.replace(RGplus,'+'); + SCpreset_number_e = SCpreset_number_e.replace(RGplus,'+'); + SCpreset_dtmf_a = SCpreset_dtmf_a.replace(RGplus,'+'); + SCpreset_dtmf_b = SCpreset_dtmf_b.replace(RGplus,'+'); SCweb_vars = SCweb_vars.replace(RGplus,'+'); } @@ -8920,6 +9012,13 @@ encoded=utf8_decode(xtest); var RGuser_custom_three = new RegExp("--A--user_custom_three--B--","g"); var RGuser_custom_four = new RegExp("--A--user_custom_four--B--","g"); var RGuser_custom_five = new RegExp("--A--user_custom_five--B--","g"); + var RGpreset_number_a = new RegExp("--A--preset_number_a--B--","g"); + var RGpreset_number_b = new RegExp("--A--preset_number_b--B--","g"); + var RGpreset_number_c = new RegExp("--A--preset_number_c--B--","g"); + var RGpreset_number_d = new RegExp("--A--preset_number_d--B--","g"); + var RGpreset_number_e = new RegExp("--A--preset_number_e--B--","g"); + var RGpreset_dtmf_a = new RegExp("--A--preset_dtmf_a--B--","g"); + var RGpreset_dtmf_b = new RegExp("--A--preset_dtmf_b--B--","g"); var RGweb_vars = new RegExp("--A--web_vars--B--","g"); encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code); @@ -8980,31 +9079,38 @@ encoded=utf8_decode(xtest); encoded = encoded.replace(RGuser_custom_three, SCuser_custom_three); encoded = encoded.replace(RGuser_custom_four, SCuser_custom_four); encoded = encoded.replace(RGuser_custom_five, SCuser_custom_five); + encoded = encoded.replace(RGpreset_number_a, SCpreset_number_a); + encoded = encoded.replace(RGpreset_number_b, SCpreset_number_b); + encoded = encoded.replace(RGpreset_number_c, SCpreset_number_c); + encoded = encoded.replace(RGpreset_number_d, SCpreset_number_d); + encoded = encoded.replace(RGpreset_number_e, SCpreset_number_e); + encoded = encoded.replace(RGpreset_dtmf_a, SCpreset_dtmf_a); + encoded = encoded.replace(RGpreset_dtmf_b, SCpreset_dtmf_b); encoded = encoded.replace(RGweb_vars, SCweb_vars); } -decoded=encoded; // simple no ? -decoded = decoded.replace(RGnl, "
"); -// while (i < encoded.length) { -// var ch = encoded.charAt(i); -// if (ch == "%") { -// if (i < (encoded.length-2) -// && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 -// && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { -// decoded += unescape( encoded.substr(i,3) ); -// i += 3; -// } else { -// alert( 'Bad escape combo near ...' + encoded.substr(i) ); -// decoded += "%[ERR]"; -// i++; -// } -// } else { -// decoded += ch; -// i++; -// } -// } // while -// decoded = decoded.replace(RGnl, "
"); -// - return false; + decoded=encoded; // simple no ? + decoded = decoded.replace(RGnl, "
"); + // while (i < encoded.length) { + // var ch = encoded.charAt(i); + // if (ch == "%") { + // if (i < (encoded.length-2) + // && HEXCHAR.indexOf(encoded.charAt(i+1)) != -1 + // && HEXCHAR.indexOf(encoded.charAt(i+2)) != -1 ) { + // decoded += unescape( encoded.substr(i,3) ); + // i += 3; + // } else { + // alert( 'Bad escape combo near ...' + encoded.substr(i) ); + // decoded += "%[ERR]"; + // i++; + // } + // } else { + // decoded += ch; + // i++; + // } + // } // while + // decoded = decoded.replace(RGnl, "
"); + // + return false; }; @@ -10518,7 +10624,7 @@ echo "\n"; height=460>
新的人工撥號紀錄給 :

請輸入下面的資訊給您想要外撥的新紀錄.
\n"; } diff --git a/agc_2-X/trunk/www/vicidial/AST_DIDstats.php b/agc_2-X/trunk/www/vicidial/AST_DIDstats.php index c7cde028..330dacf4 100644 --- a/agc_2-X/trunk/www/vicidial/AST_DIDstats.php +++ b/agc_2-X/trunk/www/vicidial/AST_DIDstats.php @@ -397,6 +397,18 @@ else $i++; } + ### Find default route + $default_route=''; + $stmt="select did_route from vicidial_inbound_dids where did_pattern='default';"; + $rslt=mysql_query($stmt, $link); + if ($DB) {echo "$stmt\n";} + $records_to_grab = mysql_num_rows($rslt); + if ($records_to_grab > 0) + { + $row=mysql_fetch_row($rslt); + $default_route = $row[0]; + } + ################################################### ### TOTALS DID SUMMARY SECTION ### if (strlen($extension[0]) > 0) @@ -413,6 +425,9 @@ else $d=0; while ($d < $stats_array_ct) { + $stat_description = ' *** default *** '; + $stat_route = $default_route; + $stat_record_array = explode(' ',$stats_array[$d]); $stat_count = ($stat_record_array[0] + 0); $stat_pattern = $stat_record_array[1];