From 3575e20e9581dbd56a789503367ed58978a43b49 Mon Sep 17 00:00:00 2001
From: mattf <mattf@3d104415-ff17-0410-8863-d5cf3c621b8a>
Date: Fri, 30 Nov 2012 15:02:52 +0000
Subject: [PATCH] Fix for user group permissions issue #588, reported by rrb555

git-svn-id: svn://192.168.202.10@1896 3d104415-ff17-0410-8863-d5cf3c621b8a
---
 .../trunk/www/vicidial/AST_agent_performance_detail.php    | 7 +++++++
 agc_2-X/trunk/www/vicidial/AST_agent_status_detail.php     | 7 +++++++
 agc_2-X/trunk/www/vicidial/AST_agent_time_detail.php       | 6 ++++++
 3 files changed, 20 insertions(+)

diff --git a/agc_2-X/trunk/www/vicidial/AST_agent_performance_detail.php b/agc_2-X/trunk/www/vicidial/AST_agent_performance_detail.php
index d052990e..42526914 100644
--- a/agc_2-X/trunk/www/vicidial/AST_agent_performance_detail.php
+++ b/agc_2-X/trunk/www/vicidial/AST_agent_performance_detail.php
@@ -30,6 +30,7 @@
 # 111007-0709 - Changed user and fullname to use non-truncated for output file
 # 111104-1249 - Added user_group restrictions for selecting in-groups
 # 120224-0910 - Added HTML display option with bar graphs
+# 121130-0952 - Fix for user group permissions issue #588
 #
 
 require("dbconnect.php");
@@ -204,6 +205,11 @@ while ($i < $campaigns_to_print)
 		{$group[$i] = $groups[$i];}
 	$i++;
 	}
+
+for ($i=0; $i<count($user_group); $i++)
+	{
+	if (eregi("--ALL--", $user_group[$i])) {$all_user_groups=1; $user_group="";}
+	}
 $stmt="select user_group from vicidial_user_groups $whereLOGadmin_viewable_groupsSQL order by user_group;";
 $rslt=mysql_query($stmt, $link);
 if ($DB) {$HTML_text.="$stmt\n";}
@@ -213,6 +219,7 @@ while ($i < $user_groups_to_print)
 	{
 	$row=mysql_fetch_row($rslt);
 	$user_groups[$i] =$row[0];
+	if ($all_user_groups) {$user_group[$i]=$row[0];}
 	$i++;
 	}
 
diff --git a/agc_2-X/trunk/www/vicidial/AST_agent_status_detail.php b/agc_2-X/trunk/www/vicidial/AST_agent_status_detail.php
index 66560499..f5d0629c 100644
--- a/agc_2-X/trunk/www/vicidial/AST_agent_status_detail.php
+++ b/agc_2-X/trunk/www/vicidial/AST_agent_status_detail.php
@@ -17,6 +17,7 @@
 # 100914-1326 - Added lookup for user_level 7 users to set to reports only which will remove other admin links
 # 111104-1248 - Added user_group restrictions for selecting in-groups
 # 120224-0910 - Added HTML display option with bar graphs
+# 121130-0958 - Fix for user group permissions issue #588
 #
 
 
@@ -190,6 +191,11 @@ while ($i < $campaigns_to_print)
 		{$group[$i] = $groups[$i];}
 	$i++;
 	}
+
+for ($i=0; $i<count($user_group); $i++)
+	{
+	if (eregi("--ALL--", $user_group[$i])) {$all_user_groups=1; $user_group="";}
+	}
 $stmt="select user_group from vicidial_user_groups $whereLOGadmin_viewable_groupsSQL order by user_group;";
 $rslt=mysql_query($stmt, $link);
 if ($DB) {echo "$stmt\n";}
@@ -199,6 +205,7 @@ while ($i < $user_groups_to_print)
 	{
 	$row=mysql_fetch_row($rslt);
 	$user_groups[$i] =$row[0];
+	if ($all_user_groups) {$user_group[$i]=$row[0];}
 	$i++;
 	}
 
diff --git a/agc_2-X/trunk/www/vicidial/AST_agent_time_detail.php b/agc_2-X/trunk/www/vicidial/AST_agent_time_detail.php
index a4201f9c..8e5f1de0 100644
--- a/agc_2-X/trunk/www/vicidial/AST_agent_time_detail.php
+++ b/agc_2-X/trunk/www/vicidial/AST_agent_time_detail.php
@@ -23,6 +23,7 @@
 # 110708-1727 - Added options.php setting for time precision
 # 111104-1248 - Added user_group restrictions for selecting in-groups
 # 120224-0910 - Added HTML display option with bar graphs
+# 121130-0957 - Fix for user group permissions issue #588
 #
 
 require("dbconnect.php");
@@ -235,6 +236,10 @@ else
 	$group_SQL = "and campaign_id IN($group_SQL)";
 	}
 
+for ($i=0; $i<count($user_group); $i++)
+	{
+	if (eregi("--ALL--", $user_group[$i])) {$all_user_groups=1; $user_group="";}
+	}
 $stmt="select user_group from vicidial_user_groups $whereLOGadmin_viewable_groupsSQL order by user_group;";
 $rslt=mysql_query($stmt, $link);
 if ($DB) {echo "$stmt\n";}
@@ -244,6 +249,7 @@ while ($i < $user_groups_to_print)
 	{
 	$row=mysql_fetch_row($rslt);
 	$user_groups[$i] =$row[0];
+	if ($all_user_groups) {$user_group[$i]=$row[0];}
 	$i++;
 	}