From 8fbe50b4a4c4b0a4c4b4ae584f38fa57ce562bda Mon Sep 17 00:00:00 2001 From: Edoardo Spadoni Date: Thu, 26 Nov 2020 17:26:56 +0100 Subject: [PATCH] nethvoice-report auths. added users to json files nethesis/dev#5907 --- functions.inc.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/functions.inc.php b/functions.inc.php index c329c3b..3346dfb 100644 --- a/functions.inc.php +++ b/functions.inc.php @@ -546,8 +546,8 @@ function nethvoice_report_config() { // Add special X and admin users for API access $config = array( - array("username" => "X", "queues" => array(), "groups" => array(), "agents" => array()), - array("username" => "admin", "queues" => array(), "groups" => array(), "agents" => array()) + array("username" => "X", "queues" => array(), "groups" => array(), "agents" => array(), "users" => array()), + array("username" => "admin", "queues" => array(), "groups" => array(), "agents" => array(), "users" => array()) ); $groups = getCTIGroups(); @@ -575,13 +575,22 @@ function nethvoice_report_config() { // Analize each CTI user foreach ($users as $u) { - $user = array("username" => $u["username"], "queues" => $u['queues'], "groups" => array(), "agents" => array()); + $user = array("username" => $u["username"], "queues" => $u['queues'], "groups" => array(), "agents" => array(), "users" => array()); foreach ($groups as $group) { if ($group["username"] == $user["username"]) { $user["groups"][] = $group["name"]; + + foreach ($groups as $g) { + if($g["name"] == $group["name"]) { + $user["users"][] = $g["username"]; + } + } } } + // remove duplicates + $user["users"] = array_unique($user["users"]); + $tmp = array(); foreach ($user["queues"] as $q) { foreach ($queues[$q] as $member) {