diff --git a/agc_2-X/trunk/www/agc/vicidial.php b/agc_2-X/trunk/www/agc/vicidial.php index 35c7b957..4bf8a82a 100644 --- a/agc_2-X/trunk/www/agc/vicidial.php +++ b/agc_2-X/trunk/www/agc/vicidial.php @@ -714,10 +714,11 @@ # 230304-0806 - Fix for AgentHangupCallRoute on ringing calls # 230306-1335 - Added 20Hz_tone browser sound, Issue #1448 # 230306-2034 - Added setTimeoutAudioLoop agent_screen_timer option, Issue #1448 +# 230407-1839 - Fix for input variable filter issue # -$version = '2.14-682c'; -$build = '230306-2034'; +$version = '2.14-683c'; +$build = '230407-1839'; $php_script = 'vicidial.php'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=98; @@ -792,6 +793,7 @@ if (!isset($flag_channels)) } $DB=preg_replace("/[^0-9a-z]/","",$DB); +$VD_login = preg_replace('/[^-_0-9\p{L}]/u','',$VD_login); $forever_stop=0; diff --git a/agc_2-X/trunk/www/vicidial/AST_team_performance_detail.php b/agc_2-X/trunk/www/vicidial/AST_team_performance_detail.php index 9908bfd3..fd2f1894 100644 --- a/agc_2-X/trunk/www/vicidial/AST_team_performance_detail.php +++ b/agc_2-X/trunk/www/vicidial/AST_team_performance_detail.php @@ -6,7 +6,7 @@ # QC statuses of QCFAIL, QCCANC and sales are defined by the Sale=Y status # flags being set on those statuses. # -# Copyright (C) 2022 Joe Johnson, Matt Florell LICENSE: AGPLv2 +# Copyright (C) 2023 Joe Johnson, Matt Florell LICENSE: AGPLv2 # # CHANGES # @@ -36,6 +36,7 @@ # 200917-1720 - Modified for sale counts to be campaign-specific # 210222-1508 - Added option to show all users # 220301-2155 - Added allow_web_debug system setting +# 230407-1039 - Added include_sales_in_TPD_report option # $startMS = microtime(); @@ -116,6 +117,11 @@ if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_fo ##### END SETTINGS LOOKUP ##### ########################################### +if (file_exists('options.php')) + { + require('options.php'); + } + $query_date_D = preg_replace('/[^- \:\_0-9a-zA-Z]/', '', $query_date_D); $query_date_T = preg_replace('/[^- \:\_0-9a-zA-Z]/', '', $query_date_T); $end_date_D = preg_replace('/[^- \:\_0-9a-zA-Z]/', '', $end_date_D); @@ -385,7 +391,7 @@ if (preg_match("/--NONE--/", $call_status_string)) $call_status_ct=0; } -$stmt="select distinct status, status_name from vicidial_statuses where sale!='Y' UNION select distinct status, status_name from vicidial_campaign_statuses where sale!='Y' $LOGallowed_campaignsSQL order by status, status_name;"; +$stmt="select distinct status, status_name from vicidial_statuses ".(!$include_sales_in_TPD_report ? "where sale!='Y'" : "")." UNION select distinct status, status_name from vicidial_campaign_statuses ".(!$include_sales_in_TPD_report ? "where sale!='Y'" : "")." $LOGallowed_campaignsSQL order by status, status_name;"; $rslt=mysql_to_mysqli($stmt, $link); if ($DB) {$HTML_text.="$stmt\n";} $call_statuses_to_print = mysqli_num_rows($rslt); diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index a718b582..30ce2933 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -5989,12 +5989,13 @@ if ($SSscript_remove_js > 0) # 230306-2050 - Added setTimeoutAudioLoop agent_screen_timer option, Issue #1448 # 230311-0859 - Added abandon_check_queue system setting, ara_url server option and show_confetti campaign feature # 230312-2212 - Fix for webphone_settings issue #1451 +# 230407-1038 - Added VERM report links to main admin Reports page # # 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.14-878a'; -$build = '230312-2212'; +$admin_version = '2.14-879a'; +$build = '230407-1038'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -48310,8 +48311,8 @@ if ($ADD==999999) echo ""._QXZ("Real-Time Reports")."
\n"; echo "
\n"; echo ""._QXZ("Inbound and Outbound Calling Reports")."
\n"; echo "