| \n";
echo "";
- $stmt="SELECT vicidial_lists.list_id,list_name,campaign_id,active,list_description,list_changedate,list_lastcalldate,reset_time,agent_script_override,campaign_cid_override,am_message_exten_override,drop_inbound_group_override,xferconf_a_number,xferconf_b_number,xferconf_c_number,xferconf_d_number,xferconf_e_number,web_form_address,web_form_address_two,time_zone_setting,inventory_report,IFNULL(audit_comments,0) from vicidial_lists left outer join vicidial_lists_custom on vicidial_lists.list_id=vicidial_lists_custom.list_id where vicidial_lists.list_id='$list_id' $LOGallowed_campaignsSQL;";
+ $stmt="SELECT vicidial_lists.list_id,list_name,campaign_id,active,list_description,list_changedate,list_lastcalldate,reset_time,agent_script_override,campaign_cid_override,am_message_exten_override,drop_inbound_group_override,xferconf_a_number,xferconf_b_number,xferconf_c_number,xferconf_d_number,xferconf_e_number,web_form_address,web_form_address_two,time_zone_setting,inventory_report,IFNULL(audit_comments,0),expiration_date,DATE_FORMAT(expiration_date,'%Y%m%d') from vicidial_lists left outer join vicidial_lists_custom on vicidial_lists.list_id=vicidial_lists_custom.list_id where vicidial_lists.list_id='$list_id' $LOGallowed_campaignsSQL;";
$rslt=mysql_query($stmt, $link);
if ($DB) {echo "$stmt\n";}
$row=mysql_fetch_row($rslt);
@@ -24693,6 +24726,8 @@ if ($ADD==311)
$time_zone_setting = $row[19];
$inventory_report = $row[20];
$audit_comments = $row[21];
+ $expiration_date = $row[22];
+ $expiration_dateINT = $row[23];
# grab names of global statuses and statuses in the selected campaign
$stmt="SELECT status,status_name,selectable,human_answered,category,sale,dnc,customer_contact,not_interested,unworkable,scheduled_callback,completed from vicidial_statuses order by status;";
@@ -24761,7 +24796,7 @@ if ($ADD==311)
{$Dgroups_menu .= "\n";}
- echo " MODIFY A LISTS RECORD: $list_id | |
| Active: | $NWB#vicidial_lists-active$NWE |
| Active: | $NWB#vicidial_lists-active$NWE \n"; + if ( ($expiration_dateINT < $EXPtestdate) and ($active == 'Y') ) + {echo " LIST EXPIRED AND SET TO ACTIVE";} + echo " |
| Reset Lead-Called-Status for this list: | $NWB#vicidial_lists-reset_list$NWE |
| Reset Times: | $NWB#vicidial_lists-reset_time$NWE |
| Expiration Date: | \n"; + echo " $NWB#vicidial_lists-expiration_date$NWE \n"; + if ($expiration_dateINT < $EXPtestdate) + { + if ($active == 'Y') + {echo " LIST EXPIRED AND SET TO ACTIVE";} + else + {echo " LIST EXPIRED";} + } + echo " |
| Audit Comments: | $NWB#vicidial_lists-audit_comments$NWE | $row[2] | "; echo "$row[7] | "; echo "$row[3] | "; - echo "$row[4] | "; + echo "$row[4]"; + if ($row[8] < $EXPtestdate) + {echo " EXP";} + echo " | "; echo "$row[5] | "; echo "$row[6] | "; echo "MODIFY | \n"; @@ -31634,7 +31696,7 @@ if ($ADD==100) $o++; } - $stmt="SELECT list_id,list_name,list_description,0,active,list_lastcalldate,campaign_id,reset_time from vicidial_lists where list_id NOT IN($lists_printed'') $LOGallowed_campaignsSQL;"; + $stmt="SELECT list_id,list_name,list_description,0,active,list_lastcalldate,campaign_id,reset_time,DATE_FORMAT(expiration_date,'%Y%m%d') from vicidial_lists where list_id NOT IN($lists_printed'') $LOGallowed_campaignsSQL;"; $rslt=mysql_query($stmt, $link); $lists_to_print = mysql_num_rows($rslt); $o=0; @@ -31650,7 +31712,10 @@ if ($ADD==100) echo "$row[2] | "; echo "$row[7] | "; echo "$row[3] | "; - echo "$row[4] | "; + echo "$row[4]"; + if ($row[8] < $EXPtestdate) + {echo " EXP";} + echo " | "; echo "$row[5] | "; echo "$row[6] | "; echo "MODIFY | \n"; @@ -34612,7 +34677,27 @@ if (isset($camp_lists)) $CCLsql = "and (called_count < $call_count_limit)"; } - $stmt="SELECT count(*) FROM vicidial_list where called_since_last_reset='N' and status IN($Dsql) and list_id IN($camp_lists) and ($all_gmtSQL) $CCLsql $DLTsql $fSQL"; + $EXPsql=''; + $expired_lists=''; + $REPORTdate = date("Y-m-d"); + $stmt="SELECT list_id FROM vicidial_lists where list_id IN($camp_lists) and (active='Y') and (expiration_date < \"$REPORTdate\");"; + #$DB=1; + if ($DB) {echo "$stmt\n";} + $rslt=mysql_query($stmt, $link); + $rslt_rows = mysql_num_rows($rslt); + $f=0; + while ($rslt_rows > $f) + { + $rowx=mysql_fetch_row($rslt); + $expired_lists .= "'$rowx[0]',"; + $f++; + } + $expired_lists = preg_replace("/,$/",'',$expired_lists); + if (strlen($expired_lists) < 2) {$expired_lists = "''";} + $EXPsql = "and list_id NOT IN($expired_lists)"; + + + $stmt="SELECT count(*) FROM vicidial_list where called_since_last_reset='N' and status IN($Dsql) and list_id IN($camp_lists) and ($all_gmtSQL) $CCLsql $DLTsql $fSQL $EXPsql"; #$DB=1; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); diff --git a/agc_2-X/trunk/www/vicidial/non_agent_api.php b/agc_2-X/trunk/www/vicidial/non_agent_api.php index f5a6bbc3..62ac9030 100644 --- a/agc_2-X/trunk/www/vicidial/non_agent_api.php +++ b/agc_2-X/trunk/www/vicidial/non_agent_api.php @@ -70,10 +70,11 @@ # 120912-2042 - Added user_group_status and in_group_status functions # 120913-1255 - Added update_log_entry function # 121116-1938 - Added state call time restrictions to add_lead hopper insert function +# 121125-2210 - Added Other Campaign DNC option and list expiration date option # -$version = '2.6-48'; -$build = '121116-1938'; +$version = '2.6-49'; +$build = '121125-2210'; $api_url_log = 0; $startMS = microtime(); @@ -319,6 +320,8 @@ if (isset($_GET["call_id"])) {$call_id=$_GET["call_id"];} elseif (isset($_POST["call_id"])) {$call_id=$_POST["call_id"];} if (isset($_GET["group"])) {$group=$_GET["group"];} elseif (isset($_POST["group"])) {$group=$_POST["group"];} +if (isset($_GET["expiration_date"])) {$expiration_date=$_GET["expiration_date"];} + elseif (isset($_POST["expiration_date"])) {$expiration_date=$_POST["expiration_date"];} header ("Content-type: text/html; charset=utf-8"); @@ -471,6 +474,7 @@ if ($non_latin < 1) $in_groups = ereg_replace("[^-\|\_0-9a-zA-Z]","",$in_groups); $call_id = ereg_replace("[^0-9a-zA-Z]","",$call_id); $group = ereg_replace("[^-\|\_0-9a-zA-Z]","",$group); + $expiration_date = ereg_replace("[^-_0-9a-zA-Z]","",$expiration_date); } else { @@ -2734,6 +2738,7 @@ if ($function == 'update_list') $webformSQL=''; $webformtwoSQL=''; $resettimeSQL=''; + $expiration_dateSQL=''; if (strlen($campaign_id) > 0) { $stmt="SELECT count(*) from vicidial_campaigns where campaign_id='$campaign_id';"; @@ -2883,6 +2888,25 @@ if ($function == 'update_list') {$resettimeSQL = " ,reset_time='$reset_time'";} } } + if (strlen($expiration_date) > 9) + { + if ($expiration_date == '--BLANK--') + {$expiration_dateSQL = " ,expiration_date='2099-12-31'";} + else + { + if (strlen($expiration_date) < 10) + { + $result = 'ERROR'; + $result_reason = "update_list EXPIRATION DATE IS NOT VALID, THIS IS AN OPTIONAL FIELD"; + $data = "$expiration_date"; + echo "$result: $result_reason: |$user|$data\n"; + api_log($link,$api_logging,$api_script,$user,$agent_user,$function,$value,$result,$result_reason,$source,$data); + exit; + } + else + {$resettimeSQL = " ,expiration_date='$expiration_date'";} + } + } if (strlen($web_form_address) > 0) { if ($web_form_address == '--BLANK--') @@ -2898,7 +2922,7 @@ if ($function == 'update_list') {$webformtwoSQL = " ,web_form_address_two='$web_form_address_two'";} } - $updateSQL = "$webformtwoSQL$webformSQL$ammessageSQL$outboundcidSQL$activeSQL$listnameSQL$campaignSQL$scriptSQL$dropingroupSQL$resettimeSQL"; + $updateSQL = "$webformtwoSQL$webformSQL$ammessageSQL$outboundcidSQL$activeSQL$listnameSQL$campaignSQL$scriptSQL$dropingroupSQL$resettimeSQL$expiration_dateSQL"; if (strlen($updateSQL)< 3) { @@ -3211,8 +3235,9 @@ if ($function == 'add_list') exit; } if (strlen($active)<1) {$active='N';} + if (strlen($expiration_date)<10) {$expiration_date='2099-12-31';} - $stmt="INSERT INTO vicidial_lists SET list_id='$list_id', list_name='$list_name', campaign_id='$campaign_id', active='$active', campaign_cid_override='$outbound_cid', agent_script_override='$script', am_message_exten_override='$am_message', drop_inbound_group_override='$drop_inbound_group', web_form_address='$web_form_address', web_form_address_two='$web_form_address_two', reset_time='$reset_time';"; + $stmt="INSERT INTO vicidial_lists SET list_id='$list_id', list_name='$list_name', campaign_id='$campaign_id', active='$active', campaign_cid_override='$outbound_cid', agent_script_override='$script', am_message_exten_override='$am_message', drop_inbound_group_override='$drop_inbound_group', web_form_address='$web_form_address', web_form_address_two='$web_form_address_two', reset_time='$reset_time', expiration_date='$expiration_date';"; $rslt=mysql_query($stmt, $link); if ($DB) {echo "|$stmt|\n";} @@ -4458,14 +4483,22 @@ if ($function == 'add_lead') if ( ($campaign_dnc_check == 'Y') or ($campaign_dnc_check == 'AREACODE') ) { if ($DB>0) {echo "DEBUG: Checking for campaign DNC\n";} + + $stmt="SELECT use_other_campaign_dnc from vicidial_campaigns where campaign_id='$campaign_id';"; + $rslt=mysql_query($stmt, $link); + $row=mysql_fetch_row($rslt); + $use_other_campaign_dnc = $row[0]; + $temp_campaign_id = $campaign_id; + if (strlen($use_other_campaign_dnc) > 0) {$temp_campaign_id = $use_other_campaign_dnc;} + if ($campaign_dnc_check == 'AREACODE') { $phone_areacode = substr($phone_number, 0, 3); $phone_areacode .= "XXXXXXX"; - $stmt="SELECT count(*) from vicidial_campaign_dnc where phone_number IN('$phone_number','$phone_areacode') and campaign_id='$campaign_id';"; + $stmt="SELECT count(*) from vicidial_campaign_dnc where phone_number IN('$phone_number','$phone_areacode') and campaign_id='$temp_campaign_id';"; } else - {$stmt="SELECT count(*) from vicidial_campaign_dnc where phone_number='$phone_number' and campaign_id='$campaign_id';";} + {$stmt="SELECT count(*) from vicidial_campaign_dnc where phone_number='$phone_number' and campaign_id='$temp_campaign_id';";} if ($DB>0) {echo "DEBUG: add_lead query - $stmt\n";} $rslt=mysql_query($stmt, $link); $row=mysql_fetch_row($rslt);