Changeset 3396


Ignore:
Timestamp:
10/21/10 18:09:17 (10 years ago)
Author:
eduardoalex
Message:

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

Location:
branches/2.2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2/calendar/inc/class.uicalendar.inc.php

    r3381 r3396  
    14481448                                if($acct_type=='g') { 
    14491449                                        $bo_groups = CreateObject('expressoAdmin1_2.group'); 
    1450                                         $users = $bo_groups->get_info($participant); 
     1450                                        $users = $bo_groups->get_info($participant,true); 
    14511451                                        foreach($users['memberuid_info'] as $user) { 
    14521452                                                if($user['type']==u) 
  • branches/2.2/expressoAdmin1_2/inc/class.group.inc.php

    r3251 r3396  
    455455                 
    456456                 
    457                 function get_info($gidnumber) 
     457                function get_info($gidnumber,$use_global_context=false) 
    458458                { 
    459                         $group_info_ldap = $this->ldap_functions->get_group_info($gidnumber); 
    460                         $group_info_db = $this->db_functions->get_group_info($gidnumber); 
     459                        $group_info_ldap = $this->ldap_functions->get_group_info($gidnumber,$use_global_context); 
     460                        $group_info_db = $this->db_functions->get_group_info($gidnumber,$use_global_context); 
    461461                         
    462462                        $group_info = array_merge($group_info_ldap, $group_info_db); 
  • branches/2.2/expressoAdmin1_2/inc/class.ldap_functions.inc.php

    r3370 r3396  
    12401240        } 
    12411241         
    1242         function get_group_info($gidnumber) 
    1243         { 
    1244                 foreach ($this->manager_contexts as $index=>$context) 
     1242        function get_group_info($gidnumber,$use_global_context=false) 
     1243        { 
     1244                $array_context = $use_global_context ? Array(0 => $GLOBALS['phpgw_info']['server']['ldap_context']) : $this->manager_contexts; 
     1245                foreach ($array_context as $index=>$context) 
    12451246                { 
    12461247                        $filter="(&(phpgwAccountType=g)(gidNumber=".$gidnumber."))"; 
Note: See TracChangeset for help on using the changeset viewer.