diff --git a/UPGRADE b/UPGRADE index 3ebe4b19..bb0a1daa 100644 --- a/UPGRADE +++ b/UPGRADE @@ -112,7 +112,7 @@ OTHER CHANGES: 20. Added new user option to allow administrative users to search for leads systemwide even in lists belonging to campaigns that the user's User - Group settings don't allow them to veiw + Group settings don't allow them to view diff --git a/docs/CELLPHONE_USA_TCPA_FCC_COMPLIANCE.txt b/docs/CELLPHONE_USA_TCPA_FCC_COMPLIANCE.txt index 86dd5adb..f8115b7b 100644 --- a/docs/CELLPHONE_USA_TCPA_FCC_COMPLIANCE.txt +++ b/docs/CELLPHONE_USA_TCPA_FCC_COMPLIANCE.txt @@ -26,7 +26,7 @@ For our clients that believe preview dialing, or click-to-dial list dialing, is UPDATE vicidial_campaigns SET auto_dial_level='1' where auto_dial_level NOT IN('0','1','1.0'); ALTER TABLE vicidial_campaigns MODIFY auto_dial_level ENUM('0','1','1.0') default '0' NOT NULL; quit - + find /srv/www/htdocs/vicidial/ -type f -exec sed -i 's/ADAPT_HARD_LIMIT/MANUAL/g' {} + find /srv/www/htdocs/vicidial/ -type f -exec sed -i 's/ADAPT_AVERAGE/MANUAL/g' {} + find /srv/www/htdocs/vicidial/ -type f -exec sed -i 's/ADAPT_TAPERED/MANUAL/g' {} + diff --git a/extras/MySQL_AST_CREATE_tables.sql b/extras/MySQL_AST_CREATE_tables.sql index 54508c88..4678939c 100644 --- a/extras/MySQL_AST_CREATE_tables.sql +++ b/extras/MySQL_AST_CREATE_tables.sql @@ -3252,6 +3252,9 @@ CREATE INDEX comment_a on live_inbound_log (comment_a); CREATE UNIQUE INDEX vicidial_campaign_statuses_key on vicidial_campaign_statuses(status, campaign_id); CREATE INDEX vlecc on vicidial_log_extended (caller_code); +CREATE INDEX vlali on vicidial_live_agents (lead_id); +CREATE INDEX vlaus on vicidial_live_agents (user); + CREATE TABLE call_log_archive LIKE call_log; CREATE TABLE vicidial_log_archive LIKE vicidial_log; @@ -3360,4 +3363,4 @@ UPDATE vicidial_configuration set value='1766' where name='qc_database_version'; UPDATE system_settings set vdc_agent_api_active='1'; -UPDATE system_settings SET db_schema_version='1397',db_schema_update_date=NOW(),reload_timestamp=NOW(); +UPDATE system_settings SET db_schema_version='1398',db_schema_update_date=NOW(),reload_timestamp=NOW(); diff --git a/extras/upgrade_2.10.sql b/extras/upgrade_2.10.sql index 69c6c590..8f095618 100644 --- a/extras/upgrade_2.10.sql +++ b/extras/upgrade_2.10.sql @@ -155,3 +155,8 @@ UPDATE system_settings SET db_schema_version='1396',db_schema_update_date=NOW() ALTER TABLE vicidial_users ADD ignore_group_on_search ENUM('1','0') default '0'; UPDATE system_settings SET db_schema_version='1397',db_schema_update_date=NOW() where db_schema_version < 1397; + +CREATE INDEX vlali on vicidial_live_agents (lead_id); +CREATE INDEX vlaus on vicidial_live_agents (user); + +UPDATE system_settings SET db_schema_version='1398',db_schema_update_date=NOW() where db_schema_version < 1398; diff --git a/www/agc/functions.php b/www/agc/functions.php index d52870d6..eb2cce98 100644 --- a/www/agc/functions.php +++ b/www/agc/functions.php @@ -4,7 +4,7 @@ # # functions for agent scripts # -# Copyright (C) 2014 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2015 Matt Florell LICENSE: AGPLv2 # # # CHANGES: @@ -24,6 +24,7 @@ # 141118-0909 - Added options for up to 9 ordered variables within QXZ function output # 141128-0846 - Code cleanup for QXZ functions # 141216-1902 - Added MYSQL language method +# 150108-1647 - removed phones count as part of validation, can cause problems when there are many phones # # $mysql_queries = 20 @@ -147,15 +148,15 @@ function user_authorization($user,$pass,$user_option,$user_update,$bcrypt,$retur $aas_total = $row[0]; } - $stmt = "SELECT count(*) FROM phones where active='Y';"; - $rslt=mysql_to_mysqli($stmt, $link); - if ($DB) {echo "$stmt\n";} - $ap_ct = mysqli_num_rows($rslt); - if ($ap_ct > 0) - { - $row=mysqli_fetch_row($rslt); - $ap_total = $row[0]; - } + # $stmt = "SELECT count(*) FROM phones where active='Y';"; + # $rslt=mysql_to_mysqli($stmt, $link); + # if ($DB) {echo "$stmt\n";} + # $ap_ct = mysqli_num_rows($rslt); + # if ($ap_ct > 0) + # { + # $row=mysqli_fetch_row($rslt); + # $ap_total = $row[0]; + # } $stmt = "SELECT count(*) FROM vicidial_live_agents where user!='$user';"; $rslt=mysql_to_mysqli($stmt, $link); @@ -191,11 +192,11 @@ function user_authorization($user,$pass,$user_option,$user_update,$bcrypt,$retur $auth_key='ERRSERVERS'; $login_problem++; } - if ($ap_total < 1) - { - $auth_key='ERRPHONES'; - $login_problem++; - } + # if ($ap_total < 1) + # { + # $auth_key='ERRPHONES'; + # $login_problem++; + # } if ( ($vla_total >= $vla_set) and ($vla_on > 0) ) { $auth_key='ERRAGENTS'; diff --git a/www/vicidial/lead_report_export.php b/www/vicidial/lead_report_export.php index 38e1b6cc..854d91d4 100644 --- a/www/vicidial/lead_report_export.php +++ b/www/vicidial/lead_report_export.php @@ -5,7 +5,7 @@ # vicidial_log and/or vicidial_closer_log information by status, list_id and # date range. downloads to a flat text file that is tab delimited # -# Copyright (C) 2014 Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2015 Matt Florell LICENSE: AGPLv2 # # CHANGES # @@ -19,6 +19,7 @@ # 140108-0710 - Added webserver and hostname to report logging # 141114-0039 - Finalized adding QXZ translation to all admin files # 141230-0951 - Added code for on-the-fly language translations display +# 150108-1705 - Fixed issue with inbound and no outbound calls export # $startMS = microtime(); @@ -423,7 +424,7 @@ if ($run_export > 0) $rslt=mysql_to_mysqli($stmt, $link); if ($DB) {echo "$stmt\n";} $outbound_to_print = mysqli_num_rows($rslt); - if ($outbound_to_print < 1) + if ( ($outbound_to_print < 1) and ($RUNgroup < 1) ) { echo _QXZ("There are no outbound calls during this time period for these parameters")."\n"; exit;