diff --git a/AST_CRON_mix_recordings.pl b/AST_CRON_mix_recordings.pl index 1c7557b..f14198e 100644 --- a/AST_CRON_mix_recordings.pl +++ b/AST_CRON_mix_recordings.pl @@ -29,6 +29,7 @@ # # 51021-1058 Added quotes around CLI executed commands # 51122-1458 Added soxmix binary path check +# 60318-0921 Added ability to mix gsm audio files # @@ -77,14 +78,15 @@ foreach(@FILES) $size2 = (-s "$dir1/$FILES[$i]"); if ($v) {print "$FILES[$i] $size2\n\n";} - - if ( ($FILES[$i] !~ /out\.wav/i) && ($size1 eq $size2) && (length($FILES[$i]) > 4)) + if ( ($FILES[$i] !~ /out\.wav|out\.gsm/i) && ($size1 eq $size2) && (length($FILES[$i]) > 4)) { $INfile = $FILES[$i]; $OUTfile = $FILES[$i]; $OUTfile =~ s/-in\.wav/-out.wav/gi; + $OUTfile =~ s/-in\.gsm/-out.gsm/gi; $ALLfile = $FILES[$i]; $ALLfile =~ s/-in\.wav/-all.wav/gi; + $ALLfile =~ s/-in\.gsm/-all.gsm/gi; if ($v) {print "|$INfile| |$OUTfile| |$ALLfile|\n\n";} diff --git a/AST_CRON_mix_recordings_BASIC.pl b/AST_CRON_mix_recordings_BASIC.pl index 4786e67..87dce18 100644 --- a/AST_CRON_mix_recordings_BASIC.pl +++ b/AST_CRON_mix_recordings_BASIC.pl @@ -29,6 +29,7 @@ # # 51021-1058 Added quotes around CLI executed commands # 51122-1456 Added soxmix binary path check +# 60318-0921 Added ability to mix gsm audio files # @@ -69,13 +70,15 @@ foreach(@FILES) if ($v) {print "$FILES[$i] $size2\n\n";} - if ( ($FILES[$i] !~ /out\.wav/i) && ($size1 eq $size2) && (length($FILES[$i]) > 4)) + if ( ($FILES[$i] !~ /out\.wav|out\.gsm/i) && ($size1 eq $size2) && (length($FILES[$i]) > 4)) { $INfile = $FILES[$i]; $OUTfile = $FILES[$i]; $OUTfile =~ s/-in\.wav/-out.wav/gi; + $OUTfile =~ s/-in\.gsm/-out.gsm/gi; $ALLfile = $FILES[$i]; $ALLfile =~ s/-in\.wav/-all.wav/gi; + $ALLfile =~ s/-in\.gsm/-all.gsm/gi; if ($v) {print "|$INfile| |$OUTfile| |$ALLfile|\n\n";} diff --git a/AST_VDhopper.pl b/AST_VDhopper.pl index baa5b92..965ad5b 100644 --- a/AST_VDhopper.pl +++ b/AST_VDhopper.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# AST_VDhopper.pl version 0.4 +# AST_VDhopper.pl version 0.5 # # DESCRIPTION: # uses Net::MySQL to update the VICIDIAL leads hopper for the new streamlined @@ -29,6 +29,8 @@ # 60215-1106 - Added Scheduled Callback release functionality # 60228-1623 - Change Callback activation to set the called_since_last_reset=N # 60228-1735 - Added hopper gmt validation to remove gmt outside of time range +# 60320-0932 - Added inactive lead list hopper deletion (Thanks Vic Jolin) +# 60322-1030 - Added super debug output # # constants @@ -60,7 +62,7 @@ if (length($ARGV[0])>1) if ($args =~ /--help/i) { - print "allowed run time options(must stay in this order):\n [--debug] = debug\n [--dbgmt] = show GMT offset of records as they are inserted into hopper\n [-t] = test\n [--level=XXX] = force a hopper_level of XXX\n [--campaign=XXX] = run for campaign XXX only\n\n"; + print "allowed run time options(must stay in this order):\n [--debug] = debug\n [--debugX] = super debug\n [--dbgmt] = show GMT offset of records as they are inserted into hopper\n [-t] = test\n [--level=XXX] = force a hopper_level of XXX\n [--campaign=XXX] = run for campaign XXX only\n\n"; } else { @@ -85,7 +87,12 @@ if (length($ARGV[0])>1) if ($args =~ /--debug/i) { $DB=1; - print "\n-----DEBUG -----\n\n"; + print "\n----- DEBUG -----\n\n"; + } + if ($args =~ /--debugX/i) + { + $DBX=1; + print "\n----- SUPER DEBUG -----\n\n"; } if ($args =~ /--dbgmt/i) { @@ -131,7 +138,7 @@ if ($dbhA->has_selected_record) while ( $record = $iter->each) { $DBSERVER_GMT = "$record->[0]"; - if ($DBSERVER_GMT) {$SERVER_GMT = $DBSERVER_GMT;} + if (length($DBSERVER_GMT)>0) {$SERVER_GMT = $DBSERVER_GMT;} } } @@ -168,6 +175,34 @@ if ($wipe_hopper_clean) exit; } +### Delete leads from inactive lists if there are any +$stmtA = "SELECT * FROM vicidial_lists where active='N';"; +if ($DB) {print $stmtA;} +$inactive_lists=''; +$inactive_lists_count=0; +$dbhA->query("$stmtA"); +if ($dbhA->has_selected_record) + { + $iter=$dbhA->create_record_iterator; + while ( $record = $iter->each) + { + $inactive_list = $record->[0]; + $inactive_lists .= "'$inactive_list',"; + $inactive_lists_count++; + } + } +if ($DB) {print "Inactive Lists: $inactive_lists_count\n";} + +if ($inactive_lists_count > 0) + { + chop($inactive_lists); + $stmtA = "DELETE from vicidial_hopper where list_id IN($inactive_lists);"; + $dbhA->query("$stmtA"); + my $affected_rows = $dbhA->get_affected_rows_length; + if ($DB) {print "Inactive List Leads Deleted: $affected_rows |$stmtA|\n";} + $event_string = "|INACTIVE LIST DEL|$affected_rows|"; + &event_logger; + } ### BEGIN Change CBHOLD status leads to CALLBK if their vicidial_callbacks time has passed @@ -332,22 +367,26 @@ foreach(@campaign_id) $GMT_allowed .= "'99'"; - if ($DB) {print "Starting hopper run for $campaign_id[$i] campaign: GMT: $local_call_time[$1] $GMT_allowed HOPPER: $hopper_level[$i] \n";} + if ($DB) {print "Starting hopper run for $campaign_id[$i] campaign- GMT: $local_call_time[$1] $GMT_allowed HOPPER: $hopper_level[$i] \n";} ### Delete the DONE leads if there are any $stmtA = "DELETE from vicidial_hopper where campaign_id='$campaign_id[$i]' and status IN('DONE');"; $dbhA->query("$stmtA"); my $affected_rows = $dbhA->get_affected_rows_length; if ($DB) {print " hopper DONE cleared: $affected_rows\n";} + if ($DBX) {print " |$stmtA|\n";} ### Delete the leads that are out of GMT time range if there are any $stmtA = "DELETE from vicidial_hopper where campaign_id='$campaign_id[$i]' and gmt_offset_now NOT IN($GMT_allowed);"; $dbhA->query("$stmtA"); my $affected_rows = $dbhA->get_affected_rows_length; if ($DB) {print " hopper GMT BAD cleared: $affected_rows\n";} + if ($DBX) {print " |$stmtA|\n";} + ### Find out how many leads are in the hopper from a specific campaign $hopper_ready_count=0; - $dbhA->query("SELECT count(*) from vicidial_hopper where campaign_id='$campaign_id[$i]' and status='READY';"); + $stmtA = "SELECT count(*) from vicidial_hopper where campaign_id='$campaign_id[$i]' and status='READY';"; + $dbhA->query("$stmtA"); if ($dbhA->has_selected_record) { $iter=$dbhA->create_record_iterator; @@ -356,6 +395,7 @@ foreach(@campaign_id) { $hopper_ready_count = $record->[0]; if ($DB) {print " hopper READY count: $hopper_ready_count\n";} + if ($DBX) {print " |$stmtA|\n";} $rec_countA++; } } @@ -367,7 +407,8 @@ foreach(@campaign_id) { if ($DB) {print " hopper too low ($hopper_ready_count|$hopper_level[$i]) starting hopper dump\n";} - $dbhA->query("SELECT list_id FROM vicidial_lists where campaign_id='$campaign_id[$i]' and active='Y';"); + $stmtA = "SELECT list_id FROM vicidial_lists where campaign_id='$campaign_id[$i]' and active='Y';"; + $dbhA->query("$stmtA"); if ($dbhA->has_selected_record) { $iter=$dbhA->create_record_iterator; @@ -381,8 +422,10 @@ foreach(@campaign_id) chop($camp_lists); } if ($DB) {print " campaign lists count: $rec_countLISTS | $camp_lists\n";} + if ($DBX) {print " |$stmtA|\n";} - $dbhA->query("SELECT count(*) FROM vicidial_list where called_since_last_reset='N' and status IN('$dial_status_a[$i]','$dial_status_b[$i]','$dial_status_c[$i]','$dial_status_d[$i]','$dial_status_e[$i]') and list_id IN($camp_lists) and gmt_offset_now IN($GMT_allowed)"); + $stmtA = "SELECT count(*) FROM vicidial_list where called_since_last_reset='N' and status IN('$dial_status_a[$i]','$dial_status_b[$i]','$dial_status_c[$i]','$dial_status_d[$i]','$dial_status_e[$i]') and list_id IN($camp_lists) and gmt_offset_now IN($GMT_allowed);"; + $dbhA->query("$stmtA"); $campaign_leads_to_call=0; if ($dbhA->has_selected_record) { @@ -391,11 +434,13 @@ foreach(@campaign_id) { $campaign_leads_to_call = "$record->[0]"; if ($DB) {print " leads to call count: $campaign_leads_to_call\n";} + if ($DBX) {print " |$stmtA|\n";} } } if ( ($lead_order[$i] eq "DOWN COUNT 2nd NEW") or ($lead_order[$i] eq "DOWN COUNT 3rd NEW") or ($lead_order[$i] eq "DOWN COUNT 4th NEW") ) { - $dbhA->query("SELECT count(*) FROM vicidial_list where called_since_last_reset='N' and status IN('NEW') and list_id IN($camp_lists) and gmt_offset_now IN($GMT_allowed)"); + $stmtA = "SELECT count(*) FROM vicidial_list where called_since_last_reset='N' and status IN('NEW') and list_id IN($camp_lists) and gmt_offset_now IN($GMT_allowed);"; + $dbhA->query("$stmtA"); $NEW_campaign_leads_to_call=0; if ($dbhA->has_selected_record) { @@ -404,6 +449,7 @@ foreach(@campaign_id) { $NEW_campaign_leads_to_call = "$record->[0]"; if ($DB) {print " NEW leads to call count: $NEW_campaign_leads_to_call\n";} + if ($DBX) {print " |$stmtA|\n";} } } } @@ -423,7 +469,10 @@ foreach(@campaign_id) else { if ($DB) {print " Getting Leads to add to hopper\n";} - $dbhA->query("SELECT lead_id FROM vicidial_hopper where campaign_id='$campaign_id[$i]';"); + ### grab leads already in hopper so we don't duplicate + $stmtA = "SELECT lead_id FROM vicidial_hopper where campaign_id='$campaign_id[$i]';"; + if ($DBX) {print " |$stmtA|\n";} + $dbhA->query("$stmtA"); $rec_countLISTS=0; $lead_id_lists = ''; if ($dbhA->has_selected_record) @@ -461,7 +510,7 @@ foreach(@campaign_id) if ($DB) {print " looking for $NEW_level NEW leads mixed in with $OTHER_level other leads\n";} $stmtA = "SELECT lead_id,list_id,gmt_offset_now,phone_number,state FROM vicidial_list where called_since_last_reset='N' and status IN('NEW') and list_id IN($camp_lists) and lead_id NOT IN($lead_id_lists) and gmt_offset_now IN($GMT_allowed) $order_stmt limit $NEW_level;"; - # if ($DB) {print " STMT |$stmtA|\n";} + if ($DBX) {print " |$stmtA|\n";} $dbhA->query("$stmtA"); if ($dbhA->has_selected_record) { @@ -487,7 +536,7 @@ foreach(@campaign_id) if ($DB) {print " lead call order: $order_stmt\n";} $stmtA = "SELECT lead_id,list_id,gmt_offset_now,phone_number,state FROM vicidial_list where called_since_last_reset='N' and status IN('$dial_status_a[$i]','$dial_status_b[$i]','$dial_status_c[$i]','$dial_status_d[$i]','$dial_status_e[$i]') and list_id IN($camp_lists) and lead_id NOT IN($lead_id_lists) and gmt_offset_now IN($GMT_allowed) $order_stmt limit $OTHER_level;"; - # if ($DB) {print " STMT |$stmtA|\n";} + if ($DBX) {print " |$stmtA|\n";} $dbhA->query("$stmtA"); if ($dbhA->has_selected_record) { diff --git a/AST_manager_listen.pl b/AST_manager_listen.pl index 2a8945c..6d407cb 100644 --- a/AST_manager_listen.pl +++ b/AST_manager_listen.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# AST_manager_listen.pl version 1.1.9 build 51222-1553 +# AST_manager_listen.pl version 1.1.11 build 60403-1230 # # Part of the Asterisk Central Queue System (ACQS) # @@ -39,6 +39,7 @@ # 50824-1606 Altered CVS/1.2 support for different output # 50901-2359 Another CVS/1.2 output parsing fix # 51222-1553 fixed parentheses bug in manager output +# 60403-1230 Added SVN/1.2.6 support for different output # # constants @@ -257,7 +258,7 @@ while($one_day_interval > 0) if ($input_lines[$ILcount] =~ /Event: Hangup/) { - if ( ($command_line[2] =~ /^Channel: /i) && ($command_line[3] =~ /^Uniqueid: /i) ) ### post 2005-08-07 CVS + if ( ($command_line[2] =~ /^Channel: /i) && ($command_line[3] =~ /^Uniqueid: /i) ) ### post 2005-08-07 CVS -- added Privilege line { $channel = $command_line[2]; $channel =~ s/Channel: |\s*$//gi; @@ -272,16 +273,32 @@ while($one_day_interval > 0) } else { - $channel = $command_line[1]; - $channel =~ s/Channel: |\s*$//gi; - $uniqueid = $command_line[2]; - $uniqueid =~ s/Uniqueid: |\s*$//gi; - $stmtA = "UPDATE vicidial_manager set status='DEAD', channel='$channel' where server_ip = '$server_ip' and uniqueid = '$uniqueid'"; + if ( ($command_line[3] =~ /^Channel: /i) && ($command_line[4] =~ /^Uniqueid: /i) ) ### post 2006-03-20 SVN -- Added Timestamp line + { + $channel = $command_line[3]; + $channel =~ s/Channel: |\s*$//gi; + $uniqueid = $command_line[4]; + $uniqueid =~ s/Uniqueid: |\s*$//gi; + $stmtA = "UPDATE vicidial_manager set status='DEAD', channel='$channel' where server_ip = '$server_ip' and uniqueid = '$uniqueid'"; - print STDERR "|$stmtA|\n"; - $dbhA->query("$stmtA"); - my $affected_rows = $dbhA->get_affected_rows_length; - if($DB){print "|$affected_rows HANGUPS updated|\n";} + print STDERR "|$stmtA|\n"; + $dbhA->query("$stmtA"); + my $affected_rows = $dbhA->get_affected_rows_length; + if($DB){print "|$affected_rows HANGUPS updated|\n";} + } + else + { + $channel = $command_line[1]; + $channel =~ s/Channel: |\s*$//gi; + $uniqueid = $command_line[2]; + $uniqueid =~ s/Uniqueid: |\s*$//gi; + $stmtA = "UPDATE vicidial_manager set status='DEAD', channel='$channel' where server_ip = '$server_ip' and uniqueid = '$uniqueid'"; + + print STDERR "|$stmtA|\n"; + $dbhA->query("$stmtA"); + my $affected_rows = $dbhA->get_affected_rows_length; + if($DB){print "|$affected_rows HANGUPS updated|\n";} + } } } @@ -332,6 +349,21 @@ while($one_day_interval > 0) my $affected_rows = $dbhA->get_affected_rows_length; if($DB){print "|$affected_rows DIALINGs updated|\n";} } + if ( ($command_line[3] =~ /^Channel: /i) && ($command_line[6] =~ /^CalleridName: /i) ) ### post 2006-03-20 -- Added Timestamp line + { + $channel = $command_line[3]; + $channel =~ s/Channel: |\s*$//gi; + $callid = $command_line[6]; + $callid =~ s/CalleridName: |\s*$//gi; + $callid =~ s/^\"//gi; $callid =~ s/\".*$//gi; + $uniqueid = $command_line[7]; + $uniqueid =~ s/Uniqueid: |\s*$//gi; + $stmtA = "UPDATE vicidial_manager set status='SENT', channel='$channel', uniqueid = '$uniqueid' where server_ip = '$server_ip' and callerid = '$callid'"; + print STDERR "|$stmtA|\n"; + $dbhA->query("$stmtA"); + my $affected_rows = $dbhA->get_affected_rows_length; + if($DB){print "|$affected_rows DIALINGs updated|\n";} + } } if ($input_lines[$ILcount] =~ /State: Ringing|State: Up/) { @@ -389,6 +421,24 @@ while($one_day_interval > 0) if($DB){print "|$affected_rows RINGINGs updated|\n";} } } + if ( ($command_line[3] =~ /^Channel: /i) && ($command_line[6] =~ /^CalleridName: /i) ) ### post 2006-03-20 SVN -- Added Timestamp line + { + $channel = $command_line[3]; + $channel =~ s/Channel: |\s*$//gi; + $callid = $command_line[6]; + $callid =~ s/CalleridName: |\s*$//gi; + $callid =~ s/^\"//gi; $callid =~ s/\".*$//gi; + $uniqueid = $command_line[7]; + $uniqueid =~ s/Uniqueid: |\s*$//gi; + $stmtA = "UPDATE vicidial_manager set status='UPDATED', channel='$channel', uniqueid = '$uniqueid' where server_ip = '$server_ip' and callerid = '$callid'"; + if ($channel !~ /local/i) + { + print STDERR "|$stmtA|\n"; + $dbhA->query("$stmtA"); + my $affected_rows = $dbhA->get_affected_rows_length; + if($DB){print "|$affected_rows RINGINGs updated|\n";} + } + } } if ($input_lines[$ILcount] =~ /Event: Newcallerid/) @@ -411,6 +461,24 @@ while($one_day_interval > 0) if($DB){print "|$affected_rows RINGINGs updated|\n";} } } + if ( ($command_line[3] =~ /^Channel: /i) && ($command_line[6] =~ /^Uniqueid: /i) ) ### post 2006-03-20 SVN -- Added Timestamp line + { + $channel = $command_line[3]; + $channel =~ s/Channel: |\s*$//gi; + $callid = $command_line[5]; + $callid =~ s/Callerid: |\s*$//gi; + $callid =~ s/^\"//gi; $callid =~ s/\".*$//gi; + $uniqueid = $command_line[6]; + $uniqueid =~ s/Uniqueid: |\s*$//gi; + $stmtA = "UPDATE vicidial_manager set status='UPDATED', channel='$channel', uniqueid = '$uniqueid' where server_ip = '$server_ip' and callerid = '$callid'"; + if ($channel =~ /local/i) + { + print STDERR "|$stmtA|\n"; + $dbhA->query("$stmtA"); + my $affected_rows = $dbhA->get_affected_rows_length; + if($DB){print "|$affected_rows RINGINGs updated|\n";} + } + } } } diff --git a/AST_update.pl b/AST_update.pl index 2ec731e..12f0a05 100644 --- a/AST_update.pl +++ b/AST_update.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# AST_update.pl version 1.1.9 (build 60117-1202) +# AST_update.pl version 1.1.11 (build 60411-1032) # # DESCRIPTION: # uses the Asterisk Manager interface and Net::MySQL to update the live_channels @@ -47,9 +47,10 @@ # 50829-1134 - Added processor percentage usage to stat collection # 51229-1355 - Added ability to take ! as delimited for 1.2 show channels concise # 60117-1202 - Changed IAX2 client phone channel to reflect change to '-' iteration +# 60411-1032 - Fixed bug in test section that caused crash with ** in extension # -$build = '60117-1202'; +$build = '60411-1032'; # constants $SYSPERF=0; # system performance logging to MySQL server_performance table every 5 seconds @@ -326,7 +327,17 @@ if (!$telnet_port) {$telnet_port = '5038';} } else { - @test_chan_12 = split(/:/, $test_channels[$s]); + $EXcount = 0; + $EXcount = @{[$test_channels[$s] =~ /\!/g]}; + if ($EXcount > 10) + { + @test_chan_12 = split(/\!/, $test_channels[$s]); + } + else + { + @test_chan_12 = split(/:/, $test_channels[$s]); + } + # @test_chan_12 = split(/:/, $test_channels[$s]); if (length($test_chan_12[6])<2) {$test_chan_12[6] = 'SIP/ring';} $test_channels[$s] = "$test_chan_12[0] $test_chan_12[6]"; } diff --git a/MySQL_AST_CREATE_tables.sql b/MySQL_AST_CREATE_tables.sql index 225cf93..5897764 100644 --- a/MySQL_AST_CREATE_tables.sql +++ b/MySQL_AST_CREATE_tables.sql @@ -234,7 +234,7 @@ status VARCHAR(6), user VARCHAR(20), vendor_lead_code VARCHAR(20), source_id VARCHAR(6), -list_id INT(8) UNSIGNED, +list_id BIGINT(14) UNSIGNED, gmt_offset_now DECIMAL(4,2) DEFAULT '0.00', called_since_last_reset ENUM('Y','N'), phone_code VARCHAR(10), @@ -271,7 +271,7 @@ lead_id INT(9) UNSIGNED NOT NULL, campaign_id VARCHAR(8), status ENUM('READY','QUEUE','INCALL','DONE') default 'READY', user VARCHAR(20), -list_id INT(9) UNSIGNED NOT NULL, +list_id BIGINT(14) UNSIGNED NOT NULL, gmt_offset_now DECIMAL(4,2) DEFAULT '0.00', index (lead_id) ); @@ -321,7 +321,7 @@ index (call_time) CREATE TABLE vicidial_log ( uniqueid DOUBLE(18,7) PRIMARY KEY UNIQUE NOT NULL, lead_id INT(9) UNSIGNED NOT NULL, -list_id INT(8) UNSIGNED, +list_id BIGINT(14) UNSIGNED, campaign_id VARCHAR(8), call_date DATETIME, start_epoch INT(10) UNSIGNED, @@ -340,7 +340,7 @@ index (call_date) CREATE TABLE vicidial_closer_log ( closecallid INT(9) UNSIGNED AUTO_INCREMENT PRIMARY KEY UNIQUE NOT NULL, lead_id INT(9) UNSIGNED NOT NULL, -list_id INT(8) UNSIGNED, +list_id BIGINT(14) UNSIGNED, campaign_id VARCHAR(20), call_date DATETIME, start_epoch INT(10) UNSIGNED, @@ -359,7 +359,7 @@ index (call_date) CREATE TABLE vicidial_xfer_log ( xfercallid INT(9) UNSIGNED AUTO_INCREMENT PRIMARY KEY UNIQUE NOT NULL, lead_id INT(9) UNSIGNED NOT NULL, -list_id INT(8) UNSIGNED, +list_id BIGINT(14) UNSIGNED, campaign_id VARCHAR(20), call_date DATETIME, phone_code VARCHAR(10), @@ -450,7 +450,7 @@ xferconf_b_number VARCHAR(50) ); CREATE TABLE vicidial_lists ( -list_id INT(8) UNSIGNED PRIMARY KEY UNIQUE NOT NULL, +list_id BIGINT(14) UNSIGNED PRIMARY KEY UNIQUE NOT NULL, list_name VARCHAR(30), campaign_id VARCHAR(8), active ENUM('Y','N') @@ -618,7 +618,7 @@ extensions_list TEXT CREATE TABLE vicidial_callbacks ( callback_id INT(9) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, lead_id INT(9) UNSIGNED, -list_id INT(8) UNSIGNED, +list_id BIGINT(14) UNSIGNED, campaign_id VARCHAR(8), status VARCHAR(10), entry_time DATETIME, @@ -631,3 +631,17 @@ index (lead_id), index (status), index (callback_time) ); + + CREATE TABLE vicidial_list_pins ( +pins_id INT(9) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, +entry_time DATETIME, +phone_number VARCHAR(10), +lead_id INT(9) UNSIGNED, +campaign_id VARCHAR(20), +product_code VARCHAR(20), +user VARCHAR(20), +digits VARCHAR(20), +index (lead_id), +index (phone_number), +index (entry_time) +); diff --git a/VICIDIAL_web/AST_server_performance.php b/VICIDIAL_web/AST_server_performance.php index 1a65284..12e5687 100644 --- a/VICIDIAL_web/AST_server_performance.php +++ b/VICIDIAL_web/AST_server_performance.php @@ -132,7 +132,7 @@ if ($DB) {echo "$stmt\n";} $row=mysql_fetch_row($rslt); $USEDram = sprintf("%10s", $row[0]); -$stmt="select count(*),SUM(length_in_min) from call_log where extension NOT IN('8365') and start_time <= '$query_date_END' and start_time >= '$query_date_BEGIN' and server_ip='$group';"; +$stmt="select count(*),SUM(length_in_min) from call_log where extension NOT IN('8365','8366','8367') and start_time <= '$query_date_END' and start_time >= '$query_date_BEGIN' and server_ip='$group';"; $rslt=mysql_query($stmt, $link); if ($DB) {echo "$stmt\n";} $row=mysql_fetch_row($rslt); diff --git a/VICIDIAL_web/AST_timeonVDADall.php b/VICIDIAL_web/AST_timeonVDADall.php index 8edd342..734fda0 100644 --- a/VICIDIAL_web/AST_timeonVDADall.php +++ b/VICIDIAL_web/AST_timeonVDADall.php @@ -30,7 +30,7 @@ $STARTtime = date("U"); $epochSIXhoursAGO = ($STARTtime - 21600); $timeSIXhoursAGO = date("Y-m-d H:i:s",$epochSIXhoursAGO); -$stmt="select campaign_id from vicidial_campaigns;"; +$stmt="select campaign_id from vicidial_campaigns where active='Y';"; $rslt=mysql_query($stmt, $link); if ($DB) {echo "$stmt\n";} $groups_to_print = mysql_num_rows($rslt); diff --git a/VICIDIAL_web/admin.php b/VICIDIAL_web/admin.php index 9afeb39..269da19 100644 --- a/VICIDIAL_web/admin.php +++ b/VICIDIAL_web/admin.php @@ -131,11 +131,14 @@ $agent_choose_ingroups=$_GET["agent_choose_ingroups"]; if (!$agent_choose_ingrou ### 60213-1100 - Added several vicidial_users permissions fields ### 60215-1319 - Added On-hold CallBacks display and links ### 60227-1226 - Fixed vicidial_inbound_groups insert bug +### 60413-1308 - Fixed list display to have 1 row/status: count and time zone tables +### - Added status name in selected dial statuses in campaign screen +### ### make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time -$version = '1.1.10-5'; -$build = '60227-1226'; +$version = '1.1.10-6'; +$build = '60413-1308'; $STARTtime = date("U"); @@ -2697,6 +2700,7 @@ echo "