Changeset 3396

Timestamp:

10/21/10 18:09:17 (14 years ago)

Author:

eduardoalex

Message:

Ticket #1223 - Corrigida a apresentacao dos usuarios de um grupo no mapa de disponibilidade

Location:

branches/2.2

Files:

• calendar/inc/class.uicalendar.inc.php (modified) (1 diff)
• expressoAdmin1_2/inc/class.group.inc.php (modified) (1 diff)
• expressoAdmin1_2/inc/class.ldap_functions.inc.php (modified) (1 diff)

branches/2.2/calendar/inc/class.uicalendar.inc.php

@@ -1448 +1448 @@
                                 if($acct_type=='g') {
                                         $bo_groups = CreateObject('expressoAdmin1_2.group');
-                                        $users = $bo_groups->get_info($participant);
+                                        $users = $bo_groups->get_info($participant,true);
                                         foreach($users['memberuid_info'] as $user) {
                                                 if($user['type']==u)

branches/2.2/expressoAdmin1_2/inc/class.group.inc.php

@@ -455 +455 @@
                 
                 
-                function get_info($gidnumber)
+                function get_info($gidnumber,$use_global_context=false)
                 {
-                        $group_info_ldap = $this->ldap_functions->get_group_info($gidnumber);
-                        $group_info_db = $this->db_functions->get_group_info($gidnumber);
+                        $group_info_ldap = $this->ldap_functions->get_group_info($gidnumber,$use_global_context);
+                        $group_info_db = $this->db_functions->get_group_info($gidnumber,$use_global_context);
                         
                         $group_info = array_merge($group_info_ldap, $group_info_db);

branches/2.2/expressoAdmin1_2/inc/class.ldap_functions.inc.php

@@ -1240 +1240 @@
         }
         
-        function get_group_info($gidnumber)
-        {
-                foreach ($this->manager_contexts as $index=>$context)
+        function get_group_info($gidnumber,$use_global_context=false)
+        {
+                $array_context = $use_global_context ? Array(0 => $GLOBALS['phpgw_info']['server']['ldap_context']) : $this->manager_contexts;
+                foreach ($array_context as $index=>$context)
                 {
                         $filter="(&(phpgwAccountType=g)(gidNumber=".$gidnumber."))";