From d9056301732099c2ac848b045d3feac18de65cf6 Mon Sep 17 00:00:00 2001 From: mattf Date: Mon, 25 Oct 2021 16:10:02 +0000 Subject: [PATCH] small report fixes git-svn-id: svn://192.168.202.10@3532 3d104415-ff17-0410-8863-d5cf3c621b8a --- www/vicidial/AST_usergroup_login_report.php | 2 +- www/vicidial/callerID_log_report.php | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/www/vicidial/AST_usergroup_login_report.php b/www/vicidial/AST_usergroup_login_report.php index 726ab2e4..379377dc 100644 --- a/www/vicidial/AST_usergroup_login_report.php +++ b/www/vicidial/AST_usergroup_login_report.php @@ -447,7 +447,7 @@ if ($SUBMIT) while ($data_row=mysqli_fetch_array($data_rslt)) { preg_match('/^[^\s]+/', $data_row["browser"], $browser_ary); - $browser=$browser_ary[0]; + if ($report_display_type=="TEXT") {$browser=$browser_ary[0];} else {$browser=$data_row["browser"];} $ASCII_text.="| ".sprintf("%-30s", $row["fullname"])." | ".sprintf("%-8s", $row["user"])." | ".sprintf("%-20s", $data_row["user_group"])." | ".sprintf("%-19s", $date_row["min_date"])." | ".sprintf("%-19s", $date_row["max_date"])." | ".sprintf("%-8s", $data_row["campaign_id"])." | ".sprintf("%-15s", $data_row["server_ip"])." | ".sprintf("%-15s", $data_row["computer_ip"])." | ".sprintf("%-20s", $data_row["ext"])." | ".sprintf("%-12s", $browser)." | ".sprintf("%-15s", $data_row["phone_login"])." | ".sprintf("%-15s", $data_row["server_phone"])." | ".sprintf("%-15s", $data_row["phone_ip"])." |\n"; $CSV_text.="\"$row[full_name]\",\"$row[user]\",\"$data_row[user_group]\",\"$date_row[min_date]\",\"$date_row[max_date]\",\"$data_row[campaign_id]\",\"$data_row[server_ip]\",\"$data_row[computer_ip]\",\"$data_row[extension]\",\"$data_row[browser]\",\"$data_row[phone_login]\",\"$data_row[server_phone]\",\"$data_row[phone_ip]\"\n"; diff --git a/www/vicidial/callerID_log_report.php b/www/vicidial/callerID_log_report.php index e745a20a..63e42332 100644 --- a/www/vicidial/callerID_log_report.php +++ b/www/vicidial/callerID_log_report.php @@ -405,7 +405,10 @@ if ($SUBMIT) $CID["$caller_id"][1]++; $log_calls++; } - else {print "$status not in $status_string
\n";} + else + { + if ($DB) {print "$status not in $status_string
\n";} + } } }