Added closecallid, xfercallid, agent_log_id as webform and script variables

git-svn-id: svn://192.168.202.10@1513 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2010-09-02 18:27:09 +00:00
parent 4c861adfe8
commit 92bdeeb4ec
4 changed files with 106 additions and 21 deletions
+3 -2
View File
@@ -296,8 +296,9 @@ OTHER CHANGES:
63. Added Manual Dial Prefix to allow for a different dial path for manual dial
calls placed through the agent interface.
64. Added did_id, did_extension, did_pattern and did_description as webform and
script variables in the agent screen.
64. Added did_id, did_extension, did_pattern, did_description, closecallid,
xfercallid and agent_log_id as webform and script variables in the agent
screen.
65. Added webphone options for System Key and Dialpad, may not be compatible
with all webphones.
+40 -15
View File
@@ -252,10 +252,10 @@
# 100712-1447 - Added entry_list_id field to vicidial_list to preserve link to custom fields if any
# 100803-0822 - Added CAMPLISTS_ALL for manual_dial_filter(issue #369)
# 100823-1612 - Added DID variables on inbound calls
#
# 100902-1348 - Added closecallid and xfercallid variables
$version = '2.4-159';
$build = '100823-1612';
$version = '2.4-160';
$build = '100902-1348';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=333;
$one_mysql_log=0;
@@ -2752,9 +2752,12 @@ if ($stage == "start")
{
if ( (strlen($uniqueid)<1) || (strlen($lead_id)<1) || (strlen($list_id)<1) || (strlen($phone_number)<1) || (strlen($campaign)<1) )
{
$fp = fopen ("./vicidial_debug.txt", "a");
fwrite ($fp, "$NOW_TIME|VL_LOG_0|$uniqueid|$lead_id|$user|$list_id|$campaign|$start_epoch|$phone_number|$agent_log_id|\n");
fclose($fp);
if ($WeBRooTWritablE > 0)
{
$fp = fopen ("./vicidial_debug.txt", "a");
fwrite ($fp, "$NOW_TIME|VL_LOG_0|$uniqueid|$lead_id|$user|$list_id|$campaign|$start_epoch|$phone_number|$agent_log_id|\n");
fclose($fp);
}
echo "LOG NOT ENTERED\n";
echo "uniqueid $uniqueid or lead_id: $lead_id or list_id: $list_id or phone_number: $phone_number or campaign: $campaign is not valid\n";
@@ -3775,9 +3778,12 @@ if ($stage == "end")
if (!ereg('.',$VDvicidial_id))
{$vidSQL = ",vicidial_id='$VDvicidial_id'";}
$fp = fopen ("./vicidial_debug.txt", "a");
fwrite ($fp, "$NOW_TIME|INBND_LOG_3|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|\n");
fclose($fp);
if ($WeBRooTWritablE > 0)
{
$fp = fopen ("./vicidial_debug.txt", "a");
fwrite ($fp, "$NOW_TIME|INBND_LOG_3|$uniqueid|$lead_id|$user|$inOUT|$VLA_inOUT|$length_in_sec|$VDterm_reason|$VDvicidial_id|$vicidial_id|$start_epoch|$recording_id|\n");
fclose($fp);
}
}
}
$length_in_sec = ($StarTtime - $start_time);
@@ -3916,6 +3922,8 @@ if ($ACTION == 'VDADcheckINCOMING')
$alt_phone_note='';
$alt_phone_active='';
$alt_phone_count='';
$INclosecallid='';
$INxfercallid='';
if ( (strlen($campaign)<1) || (strlen($server_ip)<1) )
{
@@ -4143,7 +4151,7 @@ if ($ACTION == 'VDADcheckINCOMING')
else
{
$call_type = 'IN';
$stmt = "SELECT campaign_id from vicidial_closer_log where lead_id = '$lead_id' order by call_date desc limit 1;";
$stmt = "SELECT campaign_id,closecallid,xfercallid from vicidial_closer_log where lead_id = '$lead_id' order by call_date desc limit 1;";
if ($DB) {echo "$stmt\n";}
$rslt=mysql_query($stmt, $link);
if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00183',$user,$server_ip,$session_name,$one_mysql_log);}
@@ -4151,13 +4159,15 @@ if ($ACTION == 'VDADcheckINCOMING')
if ($VDCL_mvac_ct > 0)
{
$row=mysql_fetch_row($rslt);
$VDADchannel_group =$row[0];
$VDADchannel_group = $row[0];
$INclosecallid = $row[1];
$INxfercallid = $row[2];
}
}
if ($WeBRooTWritablE > 0)
{
$fp = fopen ("./vicidial_debug.txt", "a");
fwrite ($fp, "$NOW_TIME|INBND|$callerid|$user|$user_group|$list_id|$lead_id|$phone_number|$uniqueid|$VDADchannel_group|$call_type|$dialed_number|$dialed_label\n");
fwrite ($fp, "$NOW_TIME|INBND|$callerid|$user|$user_group|$list_id|$lead_id|$phone_number|$uniqueid|$VDADchannel_group|$call_type|$dialed_number|$dialed_label|$INclosecallid|$INxfercallid|\n");
fclose($fp);
}
}
@@ -4233,7 +4243,7 @@ if ($ACTION == 'VDADcheckINCOMING')
}
}
echo "|||||$VDCL_campaign_script|$VDCL_get_call_launch|$VDCL_xferconf_a_dtmf|$VDCL_xferconf_a_number|$VDCL_xferconf_b_dtmf|$VDCL_xferconf_b_number|$VDCL_default_xfer_group|X|X|||||$VDCL_timer_action|$VDCL_timer_action_message|$VDCL_timer_action_seconds|$VDCL_xferconf_c_number|$VDCL_xferconf_d_number|$VDCL_xferconf_e_number||||$VDCL_timer_action_destination|||||\n|\n";
echo "|||||$VDCL_campaign_script|$VDCL_get_call_launch|$VDCL_xferconf_a_dtmf|$VDCL_xferconf_a_number|$VDCL_xferconf_b_dtmf|$VDCL_xferconf_b_number|$VDCL_default_xfer_group|X|X|||||$VDCL_timer_action|$VDCL_timer_action_message|$VDCL_timer_action_seconds|$VDCL_xferconf_c_number|$VDCL_xferconf_d_number|$VDCL_xferconf_e_number||||$VDCL_timer_action_destination||||||\n|\n";
if (ereg('X',$dialed_label))
{
@@ -4270,6 +4280,21 @@ if ($ACTION == 'VDADcheckINCOMING')
$rslt=mysql_query($stmt, $link);
if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00117',$user,$server_ip,$session_name,$one_mysql_log);}
if (strlen($closecallid)<1)
{
$stmt = "SELECT closecallid,xfercallid from vicidial_closer_log where lead_id='$lead_id' and user='$user' and list_id='$list_id' order by call_date desc limit 1;";
if ($DB) {echo "$stmt\n";}
$rslt=mysql_query($stmt, $link);
if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);}
$VDCL_mvac_ct = mysql_num_rows($rslt);
if ($VDCL_mvac_ct > 0)
{
$row=mysql_fetch_row($rslt);
$INclosecallid = $row[0];
$INxfercallid = $row[1];
}
}
$stmt = "select count(*) from vicidial_log where lead_id='$lead_id' and uniqueid='$uniqueid';";
if ($DB) {echo "$stmt\n";}
$rslt=mysql_query($stmt, $link);
@@ -4539,8 +4564,8 @@ if ($ACTION == 'VDADcheckINCOMING')
}
### if web form is set then send on to vicidial.php for override of WEB_FORM address
if ( (strlen($VDCL_group_web)>5) or (strlen($VDCL_group_name)>0) ) {echo "$VDCL_group_web|$VDCL_group_name|$VDCL_group_color|$VDCL_fronter_display|$VDADchannel_group|$VDCL_ingroup_script|$VDCL_get_call_launch|$VDCL_xferconf_a_dtmf|$VDCL_xferconf_a_number|$VDCL_xferconf_b_dtmf|$VDCL_xferconf_b_number|$VDCL_default_xfer_group|$VDCL_ingroup_recording_override|$VDCL_ingroup_rec_filename|$VDCL_default_group_alias|$VDCL_caller_id_number|$VDCL_group_web_vars|$VDCL_group_web_two|$VDCL_timer_action|$VDCL_timer_action_message|$VDCL_timer_action_seconds|$VDCL_xferconf_c_number|$VDCL_xferconf_d_number|$VDCL_xferconf_e_number|$VDCL_uniqueid_status_display|$custom_call_id|$VDCL_uniqueid_status_prefix|$VDCL_timer_action_destination|$DID_id|$DID_extension|$DID_pattern|$DID_description|\n";}
else {echo "X|$VDCL_group_name|$VDCL_group_color|$VDCL_fronter_display|$VDADchannel_group|$VDCL_ingroup_script|$VDCL_get_call_launch|$VDCL_xferconf_a_dtmf|$VDCL_xferconf_a_number|$VDCL_xferconf_b_dtmf|$VDCL_xferconf_b_number|$VDCL_default_xfer_group|$VDCL_ingroup_recording_override|$VDCL_ingroup_rec_filename|$VDCL_default_group_alias|$VDCL_caller_id_number|$VDCL_group_web_vars|$VDCL_group_web_two|$VDCL_timer_action|$VDCL_timer_action_message|$VDCL_timer_action_seconds|$VDCL_xferconf_c_number|$VDCL_xferconf_d_number|$VDCL_xferconf_e_number|$VDCL_uniqueid_status_display|$custom_call_id|$VDCL_uniqueid_status_prefix|$VDCL_timer_action_destination|$DID_id|$DID_extension|$DID_pattern|$DID_description|\n";}
if ( (strlen($VDCL_group_web)>5) or (strlen($VDCL_group_name)>0) ) {echo "$VDCL_group_web|$VDCL_group_name|$VDCL_group_color|$VDCL_fronter_display|$VDADchannel_group|$VDCL_ingroup_script|$VDCL_get_call_launch|$VDCL_xferconf_a_dtmf|$VDCL_xferconf_a_number|$VDCL_xferconf_b_dtmf|$VDCL_xferconf_b_number|$VDCL_default_xfer_group|$VDCL_ingroup_recording_override|$VDCL_ingroup_rec_filename|$VDCL_default_group_alias|$VDCL_caller_id_number|$VDCL_group_web_vars|$VDCL_group_web_two|$VDCL_timer_action|$VDCL_timer_action_message|$VDCL_timer_action_seconds|$VDCL_xferconf_c_number|$VDCL_xferconf_d_number|$VDCL_xferconf_e_number|$VDCL_uniqueid_status_display|$custom_call_id|$VDCL_uniqueid_status_prefix|$VDCL_timer_action_destination|$DID_id|$DID_extension|$DID_pattern|$DID_description|$INclosecallid|$INxfercallid|\n";}
else {echo "X|$VDCL_group_name|$VDCL_group_color|$VDCL_fronter_display|$VDADchannel_group|$VDCL_ingroup_script|$VDCL_get_call_launch|$VDCL_xferconf_a_dtmf|$VDCL_xferconf_a_number|$VDCL_xferconf_b_dtmf|$VDCL_xferconf_b_number|$VDCL_default_xfer_group|$VDCL_ingroup_recording_override|$VDCL_ingroup_rec_filename|$VDCL_default_group_alias|$VDCL_caller_id_number|$VDCL_group_web_vars|$VDCL_group_web_two|$VDCL_timer_action|$VDCL_timer_action_message|$VDCL_timer_action_seconds|$VDCL_xferconf_c_number|$VDCL_xferconf_d_number|$VDCL_xferconf_e_number|$VDCL_uniqueid_status_display|$custom_call_id|$VDCL_uniqueid_status_prefix|$VDCL_timer_action_destination|$DID_id|$DID_extension|$DID_pattern|$DID_description|$INclosecallid|$INxfercallid|\n";}
$stmt = "SELECT full_name from vicidial_users where user='$tsr';";
if ($DB) {echo "$stmt\n";}
+12 -2
View File
@@ -13,10 +13,11 @@
# 100116-0702 - Added preset variables
# 100127-1611 - Added ignore_list_script_override option
# 100823-1644 - Added DID variables
# 100902-1344 - Added closecallid, xfercallid, agent_log_id variables
#
$version = '2.4';
$build = '100823-1644';
$version = '2.4-8';
$build = '100902-1344';
require("dbconnect.php");
@@ -170,6 +171,12 @@ if (isset($_GET["did_pattern"])) {$did_pattern=$_GET["did_pattern"];}
elseif (isset($_POST["did_pattern"])) {$did_pattern=$_POST["did_pattern"];}
if (isset($_GET["did_description"])) {$did_description=$_GET["did_description"];}
elseif (isset($_POST["did_description"])) {$did_description=$_POST["did_description"];}
if (isset($_GET["closecallid"])) {$closecallid=$_GET["closecallid"];}
elseif (isset($_POST["closecallid"])) {$closecallid=$_POST["closecallid"];}
if (isset($_GET["xfercallid"])) {$xfercallid=$_GET["xfercallid"];}
elseif (isset($_POST["xfercallid"])) {$xfercallid=$_POST["xfercallid"];}
if (isset($_GET["agent_log_id"])) {$agent_log_id=$_GET["agent_log_id"];}
elseif (isset($_POST["agent_log_id"])) {$agent_log_id=$_POST["agent_log_id"];}
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"];}
@@ -455,6 +462,9 @@ $script_text = eregi_replace('--A--did_id--B--',"$did_id",$script_text);
$script_text = eregi_replace('--A--did_extension--B--',"$did_extension",$script_text);
$script_text = eregi_replace('--A--did_pattern--B--',"$did_pattern",$script_text);
$script_text = eregi_replace('--A--did_description--B--',"$did_description",$script_text);
$script_text = eregi_replace('--A--closecallid--B--',"$closecallid",$script_text);
$script_text = eregi_replace('--A--xfercallid--B--',"$xfercallid",$script_text);
$script_text = eregi_replace('--A--agent_log_id--B--',"$agent_log_id",$script_text);
$script_text = eregi_replace("\n","<BR>",$script_text);
$script_text = stripslashes($script_text);
+51 -2
View File
@@ -310,10 +310,11 @@
# 100823-1605 - Added DID variables for webform and scripting
# 100827-1436 - Added webphone dialpad options
# 100902-0046 - Added initial loading screen
# 100902-1349 - Added closecallid, xfercallid, agent_log_id as webform and script variables
#
$version = '2.4-288';
$build = '100902-0046';
$version = '2.4-289';
$build = '100902-1349';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=66;
$one_mysql_log=0;
@@ -3087,6 +3088,8 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
var did_id='';
var did_extension='';
var did_description='';
var closecallid='';
var xfercallid='';
var DiaLControl_auto_HTML = "<IMG SRC=\"./images/vdc_LB_pause_OFF.gif\" border=0 alt=\" Pause \"><a href=\"#\" onclick=\"AutoDial_ReSume_PauSe('VDADready');\"><IMG SRC=\"./images/vdc_LB_resume.gif\" border=0 alt=\"Resume\"></a>";
var DiaLControl_auto_HTML_ready = "<a href=\"#\" onclick=\"AutoDial_ReSume_PauSe('VDADpause');\"><IMG SRC=\"./images/vdc_LB_pause.gif\" border=0 alt=\" Pause \"></a><IMG SRC=\"./images/vdc_LB_resume_OFF.gif\" border=0 alt=\"Resume\">";
var DiaLControl_auto_HTML_OFF = "<IMG SRC=\"./images/vdc_LB_pause_OFF.gif\" border=0 alt=\" Pause \"><IMG SRC=\"./images/vdc_LB_resume_OFF.gif\" border=0 alt=\"Resume\">";
@@ -5553,6 +5556,9 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&did_extension=" + did_extension + '' +
"&did_pattern=" + did_pattern + '' +
"&did_description=" + did_description + '' +
"&closecallid=" + closecallid + '' +
"&xfercallid=" + xfercallid + '' +
"&agent_log_id=" + agent_log_id + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -5656,6 +5662,9 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&did_extension=" + did_extension + '' +
"&did_pattern=" + did_pattern + '' +
"&did_description=" + did_description + '' +
"&closecallid=" + closecallid + '' +
"&xfercallid=" + xfercallid + '' +
"&agent_log_id=" + agent_log_id + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -5987,6 +5996,9 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&did_extension=" + did_extension + '' +
"&did_pattern=" + did_pattern + '' +
"&did_description=" + did_description + '' +
"&closecallid=" + closecallid + '' +
"&xfercallid=" + xfercallid + '' +
"&agent_log_id=" + agent_log_id + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -6090,6 +6102,9 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&did_extension=" + did_extension + '' +
"&did_pattern=" + did_pattern + '' +
"&did_description=" + did_description + '' +
"&closecallid=" + closecallid + '' +
"&xfercallid=" + xfercallid + '' +
"&agent_log_id=" + agent_log_id + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -6216,6 +6231,9 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&did_extension=" + did_extension + '' +
"&did_pattern=" + did_pattern + '' +
"&did_description=" + did_description + '' +
"&closecallid=" + closecallid + '' +
"&xfercallid=" + xfercallid + '' +
"&agent_log_id=" + agent_log_id + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -6618,6 +6636,9 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&did_extension=" + did_extension + '' +
"&did_pattern=" + did_pattern + '' +
"&did_description=" + did_description + '' +
"&closecallid=" + closecallid + '' +
"&xfercallid=" + xfercallid + '' +
"&agent_log_id=" + agent_log_id + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -7052,6 +7073,8 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
did_extension = VDIC_data_VDIG[29];
did_pattern = VDIC_data_VDIG[30];
did_description = VDIC_data_VDIG[31];
closecallid = VDIC_data_VDIG[32];
xfercallid = VDIC_data_VDIG[33];
var VDIC_data_VDFR=check_VDIC_array[3].split("|");
if ( (VDIC_data_VDFR[1].length > 1) && (VDCL_fronter_display == 'Y') )
@@ -7384,6 +7407,9 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&did_extension=" + did_extension + '' +
"&did_pattern=" + did_pattern + '' +
"&did_description=" + did_description + '' +
"&closecallid=" + closecallid + '' +
"&xfercallid=" + xfercallid + '' +
"&agent_log_id=" + agent_log_id + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -7487,6 +7513,9 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&did_extension=" + did_extension + '' +
"&did_pattern=" + did_pattern + '' +
"&did_description=" + did_description + '' +
"&closecallid=" + closecallid + '' +
"&xfercallid=" + xfercallid + '' +
"&agent_log_id=" + agent_log_id + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -7596,6 +7625,9 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&did_extension=" + did_extension + '' +
"&did_pattern=" + did_pattern + '' +
"&did_description=" + did_description + '' +
"&closecallid=" + closecallid + '' +
"&xfercallid=" + xfercallid + '' +
"&agent_log_id=" + agent_log_id + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -7788,6 +7820,9 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&did_extension=" + did_extension + '' +
"&did_pattern=" + did_pattern + '' +
"&did_description=" + did_description + '' +
"&closecallid=" + closecallid + '' +
"&xfercallid=" + xfercallid + '' +
"&agent_log_id=" + agent_log_id + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -7921,6 +7956,9 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
"&did_extension=" + did_extension + '' +
"&did_pattern=" + did_pattern + '' +
"&did_description=" + did_description + '' +
"&closecallid=" + closecallid + '' +
"&xfercallid=" + xfercallid + '' +
"&agent_log_id=" + agent_log_id + '' +
webform_session;
var regWFspace = new RegExp(" ","ig");
@@ -8819,6 +8857,8 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
did_id='';
did_extension='';
did_description='';
closecallid='';
xfercallid='';
document.vicidial_form.xfername.value='';
document.vicidial_form.xfernumhidden.value='';
@@ -9775,6 +9815,9 @@ else
var SCdid_extension = did_extension;
var SCdid_pattern = did_pattern;
var SCdid_description = did_description;
var SCclosecallid = closecallid;
var SCxfercallid = xfercallid;
var SCagent_log_id = agent_log_id;
var SCweb_vars = LIVE_web_vars;
if (encoded.match(RGiframe))
@@ -9918,6 +9961,9 @@ else
var RGdid_extension = new RegExp("--A--did_extension--B--","g");
var RGdid_pattern = new RegExp("--A--did_pattern--B--","g");
var RGdid_description = new RegExp("--A--did_description--B--","g");
var RGclosecallid = new RegExp("--A--closecallid--B--","g");
var RGxfercallid = new RegExp("--A--xfercallid--B--","g");
var RGagent_log_id = new RegExp("--A--agent_log_id--B--","g");
var RGweb_vars = new RegExp("--A--web_vars--B--","g");
encoded = encoded.replace(RGvendor_lead_code, SCvendor_lead_code);
@@ -9989,6 +10035,9 @@ else
encoded = encoded.replace(RGdid_extension, SCdid_extension);
encoded = encoded.replace(RGdid_pattern, SCdid_pattern);
encoded = encoded.replace(RGdid_description, SCdid_description);
encoded = encoded.replace(RGclosecallid, SCclosecallid);
encoded = encoded.replace(RGxfercallid, SCxfercallid);
encoded = encoded.replace(RGagent_log_id, SCagent_log_id);
encoded = encoded.replace(RGweb_vars, SCweb_vars);
}
decoded=encoded; // simple no ?