diff --git a/UPGRADE b/UPGRADE index 49639fdb..41730533 100644 --- a/UPGRADE +++ b/UPGRADE @@ -83,6 +83,8 @@ OTHER CHANGES: 11. Added option to not populate the In-Group Name in the security_phrase field (the "Show" field) of the vicidial_list table on new inbound leads. +12. Added list_description as a webform and script variable + diff --git a/bin/AST_send_URL.pl b/bin/AST_send_URL.pl index 34787e8e..7a7f8e57 100644 --- a/bin/AST_send_URL.pl +++ b/bin/AST_send_URL.pl @@ -20,6 +20,7 @@ # 141219-1218 - url logging fix for some inputs # 150114-2037 - Added list_name variable # 150429-0910 - Added campaign variables +# 150609-1931 - Added list_description variable # $|++; @@ -218,9 +219,10 @@ if (length($lead_id) > 0) } $list_name=''; + $list_description=''; if (length($list_id) > 1) { - $stmtH = "SELECT list_name FROM vicidial_lists where list_id='$list_id';"; + $stmtH = "SELECT list_name,list_description FROM vicidial_lists where list_id='$list_id';"; $sthA = $dbhA->prepare($stmtH) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtH ", $dbhA->errstr; $list_name_ct=$sthA->rows; @@ -231,6 +233,10 @@ if (length($lead_id) > 0) { $list_name = $aryA[0]; } + if (length($aryA[1])>0) + { + $list_description = $aryA[1]; + } } $sthA->finish(); } @@ -315,9 +321,9 @@ if (length($lead_id) > 0) } $sthA->finish(); - if ( (length($VAR_list_id) > 1) && (length($list_name) < 1) && ($add_lead_url =~ /--A--list_name--B--/) ) + if ( (length($VAR_list_id) > 1) && ( ( (length($list_name) < 1) && ($add_lead_url =~ /--A--list_name--B--/) ) or ( (length($list_description) < 1) && ($add_lead_url =~ /--A--list_description--B--/) ) ) { - $stmtH = "SELECT list_name FROM vicidial_lists where list_id='$VAR_list_id';"; + $stmtH = "SELECT list_name,list_description FROM vicidial_lists where list_id='$VAR_list_id';"; $sthA = $dbhA->prepare($stmtH) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtH ", $dbhA->errstr; $list_name_ct=$sthA->rows; @@ -328,6 +334,10 @@ if (length($lead_id) > 0) { $list_name = $aryA[0]; } + if (length($aryA[1])>0) + { + $list_description = $aryA[1]; + } } $sthA->finish(); } @@ -338,6 +348,7 @@ if (length($lead_id) > 0) $add_lead_url =~ s/--A--vendor_lead_code--B--/$VAR_vendor_lead_code/gi; $add_lead_url =~ s/--A--list_id--B--/$VAR_list_id/gi; $add_lead_url =~ s/--A--list_name--B--/$list_name/gi; + $add_lead_url =~ s/--A--list_description--B--/$list_description/gi; $add_lead_url =~ s/--A--phone_number--B--/$VAR_phone_number/gi; $add_lead_url =~ s/--A--phone_code--B--/$VAR_phone_code/gi; $add_lead_url =~ s/--A--did_id--B--/$VAR_did_id/gi; @@ -454,9 +465,9 @@ if (length($lead_id) > 0) $sthA->finish(); } - if ( (length($VAR_list_id) > 1) && (length($list_name) < 1) && ($na_call_url =~ /--A--list_name--B--/) ) + if ( (length($VAR_list_id) > 1) && ( ( (length($list_name) < 1) && ($na_call_url =~ /--A--list_name--B--/) ) || ( (length($list_description) < 1) && ($na_call_url =~ /--A--list_description--B--/) ) ) ) { - $stmtH = "SELECT list_name FROM vicidial_lists where list_id='$VAR_list_id';"; + $stmtH = "SELECT list_name,list_description FROM vicidial_lists where list_id='$VAR_list_id';"; $sthA = $dbhA->prepare($stmtH) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtH ", $dbhA->errstr; $list_name_ct=$sthA->rows; @@ -467,6 +478,10 @@ if (length($lead_id) > 0) { $list_name = $aryA[0]; } + if (length($aryA[1])>0) + { + $list_description = $aryA[1]; + } } $sthA->finish(); } @@ -483,6 +498,7 @@ if (length($lead_id) > 0) $na_call_url =~ s/--A--source_id--B--/$VAR_source_id/gi; $na_call_url =~ s/--A--list_id--B--/$VAR_list_id/gi; $na_call_url =~ s/--A--list_name--B--/$list_name/gi; + $na_call_url =~ s/--A--list_description--B--/$list_description/gi; $na_call_url =~ s/--A--phone_code--B--/$VAR_phone_code/gi; $na_call_url =~ s/--A--phone_number--B--/$VAR_phone_number/gi; $na_call_url =~ s/--A--title--B--/$VAR_title/gi; @@ -632,9 +648,9 @@ if (length($lead_id) > 0) $sthA->finish(); } - if ( (length($VAR_list_id) > 1) && (length($list_name) < 1) && ($start_call_url =~ /--A--list_name--B--/) ) + if ( (length($VAR_list_id) > 1) && ( ( (length($list_name) < 1) && ($start_call_url =~ /--A--list_name--B--/) ) || ( (length($list_description) < 1) && ($start_call_url =~ /--A--list_description--B--/) ) ) { - $stmtH = "SELECT list_name FROM vicidial_lists where list_id='$VAR_list_id';"; + $stmtH = "SELECT list_name,list_description FROM vicidial_lists where list_id='$VAR_list_id';"; $sthA = $dbhA->prepare($stmtH) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtH ", $dbhA->errstr; $list_name_ct=$sthA->rows; @@ -645,6 +661,10 @@ if (length($lead_id) > 0) { $list_name = $aryA[0]; } + if (length($aryA[1])>0) + { + $list_description = $aryA[1]; + } } $sthA->finish(); } @@ -660,6 +680,7 @@ if (length($lead_id) > 0) $start_call_url =~ s/--A--source_id--B--/$VAR_source_id/gi; $start_call_url =~ s/--A--list_id--B--/$VAR_list_id/gi; $start_call_url =~ s/--A--list_name--B--/$list_name/gi; + $start_call_url =~ s/--A--list_description--B--/$list_description/gi; $start_call_url =~ s/--A--phone_code--B--/$VAR_phone_code/gi; $start_call_url =~ s/--A--phone_number--B--/$VAR_phone_number/gi; $start_call_url =~ s/--A--title--B--/$VAR_title/gi; diff --git a/www/agc/vdc_db_query.php b/www/agc/vdc_db_query.php index 18cc7abe..5d423cfd 100644 --- a/www/agc/vdc_db_query.php +++ b/www/agc/vdc_db_query.php @@ -379,10 +379,11 @@ # 150512-0616 - Fix for non-latin customer data # 150608-1051 - Added alt and addr3 options for manual dial search and filtering # 150609-1400 - Added script color +# 150609-1857 - Added list_description web url variable # -$version = '2.12-274'; -$build = '150609-1400'; +$version = '2.12-275'; +$build = '150609-1857'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=616; $one_mysql_log=0; @@ -1940,12 +1941,13 @@ if ($ACTION == 'manDiaLnextCaLL') } ### Get local_call_time for list - $stmt="SELECT local_call_time FROM vicidial_lists where list_id='$lead_list_id';"; + $stmt="SELECT local_call_time,list_description FROM vicidial_lists where list_id='$lead_list_id';"; $rslt=mysql_to_mysqli($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00601',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $row=mysqli_fetch_row($rslt); $list_local_call_time = $row[0]; + $list_description = $row[1]; # check that call time exists if ($list_local_call_time != "campaign") @@ -2663,7 +2665,7 @@ if ($ACTION == 'manDiaLnextCaLL') $list_local_call_time = ""; # Pull the call times for the lists - $stmt="SELECT local_call_time FROM vicidial_lists where list_id='$cur_list_id';"; + $stmt="SELECT local_call_time,list_description FROM vicidial_lists where list_id='$cur_list_id';"; $rslt=mysql_to_mysqli($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00604',$user,$server_ip,$session_name,$one_mysql_log);} $rslt_ct = mysqli_num_rows($rslt); @@ -2672,6 +2674,7 @@ if ($ACTION == 'manDiaLnextCaLL') #set Cur call_time $row=mysqli_fetch_row($rslt); $cur_call_time = $row[0]; + $list_description = $row[1]; } # check that call time exists @@ -3383,12 +3386,13 @@ if ($ACTION == 'manDiaLnextCaLL') $POSTgmt_offset = lookup_gmt($phone_code,$USarea,$state,$LOCAL_GMT_OFF_STD,$Shour,$Smin,$Ssec,$Smon,$Smday,$Syear,$postalgmtNOW,$postal_code); ### Get local_call_time for list - $stmt="SELECT local_call_time FROM vicidial_lists where list_id='$lead_list_id';"; + $stmt="SELECT local_call_time,list_description FROM vicidial_lists where list_id='$lead_list_id';"; $rslt=mysql_to_mysqli($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00608',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $row=mysqli_fetch_row($rslt); $list_local_call_time = $row[0]; + $list_description = $row[1]; # check that call time exists if ($list_local_call_time != "campaign") @@ -3564,7 +3568,7 @@ if ($ACTION == 'manDiaLnextCaLL') ### check if there is a list_id override if (strlen($list_id) > 1) { - $stmt = "SELECT campaign_cid_override,web_form_address,web_form_address_two,web_form_address_three FROM vicidial_lists where list_id='$list_id';"; + $stmt = "SELECT campaign_cid_override,web_form_address,web_form_address_two,web_form_address_three,list_description FROM vicidial_lists where list_id='$list_id';"; $rslt=mysql_to_mysqli($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00245',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} @@ -3576,6 +3580,7 @@ if ($ACTION == 'manDiaLnextCaLL') $LISTweb_form_address = $row[1]; $LISTweb_form_address_two = $row[2]; $LISTweb_form_address_three = $row[3]; + $list_description = $row[4]; } } @@ -3948,7 +3953,7 @@ if ($ACTION == 'manDiaLnextCaLL') $row=mysqli_fetch_row($rslt); $script_recording_delay = $row[0]; } - $stmt = "SELECT agent_script_override from vicidial_lists where list_id='$list_id';"; + $stmt = "SELECT agent_script_override,list_description from vicidial_lists where list_id='$list_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_to_mysqli($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);} @@ -3957,6 +3962,7 @@ if ($ACTION == 'manDiaLnextCaLL') { $row=mysqli_fetch_row($rslt); $VDCL_campaign_script = $row[0]; + $list_description = $row[1]; } } } @@ -3985,7 +3991,7 @@ if ($ACTION == 'manDiaLnextCaLL') ### Look for number preset override settings from list if (strlen($list_id)>0) { - $stmt = "SELECT xferconf_a_number,xferconf_b_number,xferconf_c_number,xferconf_d_number,xferconf_e_number,list_name from vicidial_lists where list_id='$list_id';"; + $stmt = "SELECT xferconf_a_number,xferconf_b_number,xferconf_c_number,xferconf_d_number,xferconf_e_number,list_name,list_description from vicidial_lists where list_id='$list_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_to_mysqli($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00278',$user,$server_ip,$session_name,$one_mysql_log);} @@ -4005,6 +4011,7 @@ if ($ACTION == 'manDiaLnextCaLL') {$VDCL_xferconf_e_number = $row[4];} if (strlen($row[5]) > 0) {$list_name = $row[5];} + $list_description = $row[6]; } $custom_field_names='|'; @@ -4127,6 +4134,7 @@ if ($ACTION == 'manDiaLnextCaLL') $LeaD_InfO .= $list_name . "\n"; $LeaD_InfO .= $LISTweb_form_address_three . "\n"; $LeaD_InfO .= $VDCL_ingroup_script_color . "\n"; + $LeaD_InfO .= $list_description . "\n"; echo $LeaD_InfO; } @@ -4464,7 +4472,7 @@ if ($ACTION == 'manDiaLonly') if (strlen($list_id) > 1) { - $stmt = "SELECT campaign_cid_override,web_form_address,web_form_address_two,web_form_address_three FROM vicidial_lists where list_id='$list_id';"; + $stmt = "SELECT campaign_cid_override,web_form_address,web_form_address_two,web_form_address_three,list_description FROM vicidial_lists where list_id='$list_id';"; $rslt=mysql_to_mysqli($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00247',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} @@ -4476,6 +4484,7 @@ if ($ACTION == 'manDiaLonly') $LISTweb_form_address = $row[1]; $LISTweb_form_address_two = $row[2]; $LISTweb_form_address_three = $row[3]; + $list_description = $row[4]; } } } @@ -6767,7 +6776,7 @@ if ($ACTION == 'VDADcheckINCOMING') ### Check for List ID override settings if (strlen($list_id)>0) { - $stmt = "SELECT xferconf_a_number,xferconf_b_number,xferconf_c_number,xferconf_d_number,xferconf_e_number,web_form_address,web_form_address_two,list_name,web_form_address_three from vicidial_lists where list_id='$list_id';"; + $stmt = "SELECT xferconf_a_number,xferconf_b_number,xferconf_c_number,xferconf_d_number,xferconf_e_number,web_form_address,web_form_address_two,list_name,web_form_address_three,list_description from vicidial_lists where list_id='$list_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_to_mysqli($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00281',$user,$server_ip,$session_name,$one_mysql_log);} @@ -6793,6 +6802,7 @@ if ($ACTION == 'VDADcheckINCOMING') {$list_name = $row[7];} if (strlen($row[8]) > 5) {$VDCL_group_web_three = $row[8];} + $list_description = $row[9]; } } @@ -7082,7 +7092,7 @@ if ($ACTION == 'VDADcheckINCOMING') ### Check for List ID override settings if (strlen($list_id)>0) { - $stmt = "SELECT xferconf_a_number,xferconf_b_number,xferconf_c_number,xferconf_d_number,xferconf_e_number,web_form_address,web_form_address_two,list_name,web_form_address_three from vicidial_lists where list_id='$list_id';"; + $stmt = "SELECT xferconf_a_number,xferconf_b_number,xferconf_c_number,xferconf_d_number,xferconf_e_number,web_form_address,web_form_address_two,list_name,web_form_address_three,list_description from vicidial_lists where list_id='$list_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_to_mysqli($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00282',$user,$server_ip,$session_name,$one_mysql_log);} @@ -7108,6 +7118,7 @@ if ($ACTION == 'VDADcheckINCOMING') {$list_name = $row[7];} if (strlen($row[8]) > 5) {$VDCL_group_web_three = $row[8];} + $list_description = $row[9]; } } @@ -7286,6 +7297,7 @@ if ($ACTION == 'VDADcheckINCOMING') $LeaD_InfO .= $list_name . "\n"; $LeaD_InfO .= $LISTweb_form_address_three . "\n"; $LeaD_InfO .= $VDCL_ingroup_script_color . "\n"; + $LeaD_InfO .= $list_description . "\n"; echo $LeaD_InfO; @@ -7389,6 +7401,7 @@ if ($ACTION == 'VDADcheckINCOMING') $VDCL_start_call_url = preg_replace('/--A--vendor_lead_code--B--/i',urlencode(trim($vendor_id)),$VDCL_start_call_url); $VDCL_start_call_url = preg_replace('/--A--list_id--B--/i',urlencode(trim($list_id)),$VDCL_start_call_url); $VDCL_start_call_url = preg_replace('/--A--list_name--B--/i',urlencode(trim($list_name)),$VDCL_start_call_url); + $VDCL_start_call_url = preg_replace('/--A--list_description--B--/i',urlencode(trim($list_description)),$VDCL_start_call_url); $VDCL_start_call_url = preg_replace('/--A--gmt_offset_now--B--/i',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); $VDCL_start_call_url = preg_replace('/--A--phone_code--B--/i',urlencode(trim($phone_code)),$VDCL_start_call_url); $VDCL_start_call_url = preg_replace('/--A--phone_number--B--/i',urlencode(trim($phone_number)),$VDCL_start_call_url); @@ -8092,7 +8105,7 @@ if ($ACTION == 'VDADcheckINCOMINGemail') ### Check for List ID override settings if (strlen($list_id)>0) { - $stmt = "SELECT xferconf_a_number,xferconf_b_number,xferconf_c_number,xferconf_d_number,xferconf_e_number,web_form_address,web_form_address_two,list_name,web_form_address_three from vicidial_lists where list_id='$list_id';"; + $stmt = "SELECT xferconf_a_number,xferconf_b_number,xferconf_c_number,xferconf_d_number,xferconf_e_number,web_form_address,web_form_address_two,list_name,web_form_address_three,list_description from vicidial_lists where list_id='$list_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_to_mysqli($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00508',$user,$server_ip,$session_name,$one_mysql_log);} @@ -8118,6 +8131,7 @@ if ($ACTION == 'VDADcheckINCOMINGemail') {$list_name = $row[7];} if (strlen($row[8]) > 5) {$VDCL_group_web_three = $row[8];} + $list_description = $row[9]; } } @@ -8265,6 +8279,7 @@ if ($ACTION == 'VDADcheckINCOMINGemail') $LeaD_InfO .= $list_name . "\n"; $LeaD_InfO .= $LISTweb_form_address_three . "\n"; $LeaD_InfO .= $VDCL_ingroup_script_color . "\n"; + $LeaD_InfO .= $list_description . "\n"; echo $LeaD_InfO; @@ -8368,6 +8383,7 @@ if ($ACTION == 'VDADcheckINCOMINGemail') $VDCL_start_call_url = preg_replace('/--A--vendor_lead_code--B--/i',urlencode(trim($vendor_id)),$VDCL_start_call_url); $VDCL_start_call_url = preg_replace('/--A--list_id--B--/i',urlencode(trim($list_id)),$VDCL_start_call_url); $VDCL_start_call_url = preg_replace('/--A--list_name--B--/i',urlencode(trim($list_name)),$VDCL_start_call_url); + $VDCL_start_call_url = preg_replace('/--A--list_description--B--/i',urlencode(trim($list_description)),$VDCL_start_call_url); $VDCL_start_call_url = preg_replace('/--A--gmt_offset_now--B--/i',urlencode(trim($gmt_offset_now)),$VDCL_start_call_url); $VDCL_start_call_url = preg_replace('/--A--phone_code--B--/i',urlencode(trim($phone_code)),$VDCL_start_call_url); $VDCL_start_call_url = preg_replace('/--A--phone_number--B--/i',urlencode(trim($phone_number)),$VDCL_start_call_url); @@ -9069,7 +9085,7 @@ if ($ACTION == 'LeaDSearcHSelecTUpdatE') ### Check for List ID override settings if (strlen($list_id)>0) { - $stmt = "SELECT xferconf_a_number,xferconf_b_number,xferconf_c_number,xferconf_d_number,xferconf_e_number,web_form_address,web_form_address_two,list_name,web_form_address_three from vicidial_lists where list_id='$list_id';"; + $stmt = "SELECT xferconf_a_number,xferconf_b_number,xferconf_c_number,xferconf_d_number,xferconf_e_number,web_form_address,web_form_address_two,list_name,web_form_address_three,list_description from vicidial_lists where list_id='$list_id';"; if ($DB) {echo "$stmt\n";} $rslt=mysql_to_mysqli($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00473',$user,$server_ip,$session_name,$one_mysql_log);} @@ -9095,6 +9111,7 @@ if ($ACTION == 'LeaDSearcHSelecTUpdatE') {$list_name = $row[7];} if (strlen($row[8]) > 5) {$VDCL_group_web_three = $row[8];} + $list_description = $row[9]; } } @@ -9284,6 +9301,7 @@ if ($ACTION == 'LeaDSearcHSelecTUpdatE') $LeaD_InfO .= $list_name . "\n"; $LeaD_InfO .= $LISTweb_form_address_three . "\n"; $LeaD_InfO .= $VDCL_ingroup_script_color . "\n"; + $LeaD_InfO .= $list_description . "\n"; echo $LeaD_InfO; @@ -10669,9 +10687,9 @@ if ($ACTION == 'updateDISPO') $entry_list_id = urlencode(trim($row[34])); } - if (preg_match('/list_name--B--/i',$dispo_call_url)) + if (preg_match('/list_name--B--|list_description--B--/i',$dispo_call_url)) { - $stmt = "SELECT list_name from vicidial_lists where list_id='$list_id' limit 1;"; + $stmt = "SELECT list_name,list_description from vicidial_lists where list_id='$list_id' limit 1;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_to_mysqli($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00609',$user,$server_ip,$session_name,$one_mysql_log);} @@ -10680,6 +10698,7 @@ if ($ACTION == 'updateDISPO') { $row=mysqli_fetch_row($rslt); $list_name = urlencode(trim($row[0])); + $list_description = urlencode(trim($row[1])); } } @@ -10689,6 +10708,7 @@ if ($ACTION == 'updateDISPO') $dispo_call_url = preg_replace('/--A--vendor_lead_code--B--/i',"$vendor_lead_code",$dispo_call_url); $dispo_call_url = preg_replace('/--A--list_id--B--/i',"$list_id",$dispo_call_url); $dispo_call_url = preg_replace('/--A--list_name--B--/i',"$list_name",$dispo_call_url); + $dispo_call_url = preg_replace('/--A--list_description--B--/i',"$list_description",$dispo_call_url); $dispo_call_url = preg_replace('/--A--gmt_offset_now--B--/i',"$gmt_offset_now",$dispo_call_url); $dispo_call_url = preg_replace('/--A--phone_code--B--/i',"$phone_code",$dispo_call_url); $dispo_call_url = preg_replace('/--A--phone_number--B--/i',"$phone_number",$dispo_call_url); @@ -13179,12 +13199,13 @@ if ($ACTION == 'LEADINFOview') $POSTgmt_offset = lookup_gmt($phone_code,$USarea,$state,$LOCAL_GMT_OFF_STD,$Shour,$Smin,$Ssec,$Smon,$Smday,$Syear,$postalgmtNOW,$postal_code); ### Get local_call_time for list - $stmt="SELECT local_call_time FROM vicidial_lists where list_id='$lead_list_id';"; + $stmt="SELECT local_call_time,list_description FROM vicidial_lists where list_id='$lead_list_id';"; $rslt=mysql_to_mysqli($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00610',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} $rowy=mysqli_fetch_row($rslt); $list_local_call_time = $rowy[0]; + $list_description = $rowy[1]; # check that call time exists if ($list_local_call_time != "campaign") @@ -13769,7 +13790,7 @@ if ($ACTION == 'CalLBacKLisT') $lead_list_id = $row[5]; ### Get local_call_time for list - $stmt="SELECT local_call_time FROM vicidial_lists where list_id='$lead_list_id';"; + $stmt="SELECT local_call_time,list_description FROM vicidial_lists where list_id='$lead_list_id';"; $rslt=mysql_to_mysqli($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00611',$user,$server_ip,$session_name,$one_mysql_log);} if ($DB) {echo "$stmt\n";} @@ -13778,6 +13799,7 @@ if ($ACTION == 'CalLBacKLisT') { $rowy=mysqli_fetch_row($rslt); $list_local_call_time = $rowy[0]; + $list_description = $rowy[1]; } # check that call time exists diff --git a/www/agc/vdc_form_display.php b/www/agc/vdc_form_display.php index daea23e1..e62b8187 100644 --- a/www/agc/vdc_form_display.php +++ b/www/agc/vdc_form_display.php @@ -32,10 +32,11 @@ # 150312-1502 - Allow for single quotes in vicidial_list data fields # 150418-1751 - Added fixed fields to submit output, issue #842 # 150512-0617 - Fix for non-latin customer data +# 150609-1923 - Added list_description variable # -$version = '2.12-23'; -$build = '150512-0617'; +$version = '2.12-24'; +$build = '150609-1923'; require_once("dbconnect_mysqli.php"); require_once("functions.php"); @@ -173,6 +174,8 @@ if (isset($_GET["called_count"])) {$called_count=$_GET["called_count"];} elseif (isset($_POST["called_count"])) {$called_count=$_POST["called_count"];} if (isset($_GET["list_name"])) {$list_name=$_GET["list_name"];} elseif (isset($_POST["list_name"])) {$list_name=$_POST["list_name"];} +if (isset($_GET["list_description"])) {$list_description=$_GET["list_description"];} + elseif (isset($_POST["list_description"])) {$list_description=$_POST["list_description"];} if ($bcrypt == 'OFF') {$bcrypt=0;} diff --git a/www/agc/vicidial.php b/www/agc/vicidial.php index 990ee57c..aa0d20e3 100644 --- a/www/agc/vicidial.php +++ b/www/agc/vicidial.php @@ -488,10 +488,11 @@ # 150522-1254 - Fixed issue #859 # 150608-1126 - Added campaign option to disable the manual dial override field # 150609-1736 - Added status_display_ingroup option +# 150609-1917 - Added list_description web url variable # -$version = '2.12-460c'; -$build = '150609-1736'; +$version = '2.12-461c'; +$build = '150609-1917'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=85; $one_mysql_log=0; @@ -6909,6 +6910,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) document.vicidial_form.list_name.value = change_array[55]; // list webform3 - 56 // script color - 57 + document.vicidial_form.list_description.value = change_array[58]; if (hide_gender > 0) { @@ -8087,6 +8089,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) document.vicidial_form.list_name.value = MDnextResponse_array[53]; var list_webform_three = MDnextResponse_array[54]; CalL_ScripT_color = MDnextResponse_array[55]; + document.vicidial_form.list_description.value = MDnextResponse_array[56]; timer_action = campaign_timer_action; timer_action_message = campaign_timer_action_message; @@ -8364,6 +8367,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) document.vicidial_form.vendor_lead_code.value=''; document.vicidial_form.list_id.value =''; document.vicidial_form.list_name.value =''; + document.vicidial_form.list_description.value=''; document.vicidial_form.entry_list_id.value =''; document.vicidial_form.gmt_offset_now.value =''; document.vicidial_form.phone_code.value =''; @@ -9180,6 +9184,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) document.vicidial_form.list_name.value = check_VDIC_array[55]; // list webform3 - 56 CalL_ScripT_color = check_VDIC_array[57]; + document.vicidial_form.list_description.value = check_VDIC_array[58]; if (CalL_ScripT_color.length > 1) {document.getElementById("ScriptContents").style.backgroundColor = CalL_ScripT_color;} @@ -9754,6 +9759,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) document.vicidial_form.list_name.value = check_VDIC_array[51]; // list webform3 - 52 // script color - 53 + document.vicidial_form.list_description.value = check_VDIC_array[54]; if (hide_gender > 0) { @@ -11321,6 +11327,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) document.vicidial_form.vendor_lead_code.value=''; document.vicidial_form.list_id.value =''; document.vicidial_form.list_name.value =''; + document.vicidial_form.list_description.value=''; document.vicidial_form.entry_list_id.value =''; document.vicidial_form.gmt_offset_now.value =''; document.vicidial_form.phone_code.value =''; @@ -12791,6 +12798,7 @@ else "&call_id=" + LasTCID + '' + "&user_group=" + VU_user_group + '' + "&list_name=" + encodeURIComponent(document.vicidial_form.list_name.value) + + "&list_description=" + encodeURIComponent(document.vicidial_form.list_description.value) + "&web_vars=" + LIVE_web_vars + '' + webform_session; @@ -12940,6 +12948,7 @@ else var SCsource_id = source_id; var SClist_id = encodeURIComponent(document.vicidial_form.list_id.value); var SClist_name = encodeURIComponent(document.vicidial_form.list_name.value); + var SClist_description = encodeURIComponent(document.vicidial_form.list_description.value); var SCgmt_offset_now = encodeURIComponent(document.vicidial_form.gmt_offset_now.value); var SCcalled_since_last_reset = ""; var SCphone_code = encodeURIComponent(document.vicidial_form.phone_code.value); @@ -13020,6 +13029,7 @@ else SCsource_id = SCsource_id.replace(RGplus,'+'); SClist_id = SClist_id.replace(RGplus,'+'); SClist_name = SClist_name.replace(RGplus,'+'); + SClist_description = SClist_description.replace(RGplus,'+'); SCgmt_offset_now = SCgmt_offset_now.replace(RGplus,'+'); SCcalled_since_last_reset = SCcalled_since_last_reset.replace(RGplus,'+'); SCphone_code = SCphone_code.replace(RGplus,'+'); @@ -13094,6 +13104,7 @@ else var RGsource_id = new RegExp("--A--source_id--B--","g"); var RGlist_id = new RegExp("--A--list_id--B--","g"); var RGlist_name = new RegExp("--A--list_name--B--","g"); + var RGlist_description = new RegExp("--A--list_description--B--","g"); var RGgmt_offset_now = new RegExp("--A--gmt_offset_now--B--","g"); var RGcalled_since_last_reset = new RegExp("--A--called_since_last_reset--B--","g"); var RGphone_code = new RegExp("--A--phone_code--B--","g"); @@ -13172,6 +13183,7 @@ else encoded = encoded.replace(RGsource_id, SCsource_id); encoded = encoded.replace(RGlist_id, SClist_id); encoded = encoded.replace(RGlist_name, SClist_name); + encoded = encoded.replace(RGlist_description, SClist_description); encoded = encoded.replace(RGgmt_offset_now, SCgmt_offset_now); encoded = encoded.replace(RGcalled_since_last_reset, SCcalled_since_last_reset); encoded = encoded.replace(RGphone_code, SCphone_code); @@ -15821,6 +15833,7 @@ $zi=2; + diff --git a/www/vicidial/admin.php b/www/vicidial/admin.php index 809db3a3..f8f54858 100644 --- a/www/vicidial/admin.php +++ b/www/vicidial/admin.php @@ -3508,12 +3508,13 @@ else # 150608-1127 - Added manual dial filer and search options for ALT/ADDR3 numbers, Added manual dial override field campaign option # 150609-1207 - Fixes for chat settings # 150609-1216 - Added in-group and script display settings +# 150609-2142 - Changes for different types of in-groups # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 9 to access this page the first time -$admin_version = '2.12-489a'; -$build = '150609-1216'; +$admin_version = '2.12-490a'; +$build = '150609-2142'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -6221,7 +6222,7 @@ if ($ADD==1211) echo ""._QXZ("Source Group ID").":