From 17949d4643a91609528929f4a6379e9916cb7ca3 Mon Sep 17 00:00:00 2001 From: mattf Date: Sat, 14 Nov 2020 11:42:03 +0000 Subject: [PATCH] Allow inclusion of Real-Time report in custom reports git-svn-id: svn://192.168.202.10@3326 3d104415-ff17-0410-8863-d5cf3c621b8a --- www/vicidial/AST_timeonVDADall.php | 4 ++-- www/vicidial/realtime_report.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/vicidial/AST_timeonVDADall.php b/www/vicidial/AST_timeonVDADall.php index 23b10e22..f683c0da 100644 --- a/www/vicidial/AST_timeonVDADall.php +++ b/www/vicidial/AST_timeonVDADall.php @@ -563,12 +563,12 @@ $LOGuser_group = $row[1]; $LOGadmin_hide_lead_data = $row[2]; $LOGadmin_hide_phone_data = $row[3]; -$stmt="SELECT allowed_campaigns,allowed_reports from vicidial_user_groups where user_group='$LOGuser_group';"; +$stmt="SELECT allowed_campaigns,allowed_reports,allowed_custom_reports from vicidial_user_groups where user_group='$LOGuser_group';"; if ($DB) {echo "|$stmt|\n";} $rslt=mysql_to_mysqli($stmt, $link); $row=mysqli_fetch_row($rslt); $LOGallowed_campaigns = $row[0]; -$LOGallowed_reports = $row[1]; +$LOGallowed_reports = "$row[1]|$row[2]"; if ( (!preg_match("/$report_name/",$LOGallowed_reports)) and (!preg_match("/ALL REPORTS/",$LOGallowed_reports)) ) { diff --git a/www/vicidial/realtime_report.php b/www/vicidial/realtime_report.php index f164c133..9824feca 100644 --- a/www/vicidial/realtime_report.php +++ b/www/vicidial/realtime_report.php @@ -587,12 +587,12 @@ $row=mysqli_fetch_row($rslt); $realtime_block_user_info = $row[0]; $LOGuser_group = $row[1]; -$stmt="SELECT allowed_campaigns,allowed_reports,webphone_url_override,webphone_dialpad_override,webphone_systemkey_override from vicidial_user_groups where user_group='$LOGuser_group';"; +$stmt="SELECT allowed_campaigns,allowed_reports,webphone_url_override,webphone_dialpad_override,webphone_systemkey_override,allowed_custom_reports from vicidial_user_groups where user_group='$LOGuser_group';"; if ($DB) {echo "|$stmt|\n";} $rslt=mysql_to_mysqli($stmt, $link); $row=mysqli_fetch_row($rslt); $LOGallowed_campaigns = $row[0]; -$LOGallowed_reports = $row[1]; +$LOGallowed_reports = "$row[1]$row[5]"; $webphone_url = $row[2]; $webphone_dialpad_override = $row[3]; $system_key = $row[4];