Changeset 3404 for branches/2.2/phpgwapi/templates/classic/listUsers.php

Timestamp:

10/22/10 16:04:42 (14 years ago)

Author:

valmir.sena

Message:

Ticket #1386 - Implementar possibilidade de compartilhar agenda com um GRUPO - branch22

File:

• branches/2.2/phpgwapi/templates/classic/listUsers.php (modified) (4 diffs)

branches/2.2/phpgwapi/templates/classic/listUsers.php

@@ -115 +115 @@
         $users = Array();
         $groups = Array();
-        $justthese = array("phpgwaccountvisible","uidNumber","cn");
+        $justthese = array("phpgwaccountvisible","uidNumber","cn","phpgwaccounttype","gidnumber");
         
         $typeAccount = 'u';
@@ -126 +126 @@
     if ($ds) 
     {
-                $sr=ldap_search($ds, $user_context, ("(&(cn=$cn)(phpgwaccounttype=".$typeAccount."))"),$justthese);     
-                $info = ldap_get_entries($ds, $sr);
-                
-                if($typeAccount == 'u'){ 
+                if( $acl_app == 'calendar' ){
+                        $sr=ldap_search($ds, $user_context, ("(&(cn=$cn)(|(phpgwaccounttype=u)(phpgwaccounttype=g)))"),$justthese);
+                        $info = ldap_get_entries($ds, $sr);
+                        
                         for ($i=0; $i<$info["count"]; $i++)
-                        {
-                                if ($info[$i]["phpgwaccountvisible"][0] == '-1')
-                                        continue;
-                                $users[$uids=$info[$i]["uidnumber"][0]] = Array('name'  =>      $uids=$info[$i]["cn"][0], 'type'        =>      u );
-                        }
-                }
-                else {
-                        for ($i=0; $i<$info["count"]; $i++)     
-                                $users[$uids=$info[$i]["gidnumber"][0]] = Array('name'  =>      $uids=$info[$i]["cn"][0], 'type'        =>      g);             
-                
-                }
+                                {
+                                        if ($info[$i]["phpgwaccountvisible"][0] == '-1')
+                                                continue;
+                                        if( $info[$i]["phpgwaccounttype"][0] == 'u')
+                                                $users[$uids=$info[$i]["uidnumber"][0]] = Array('name'  =>      $uids=$info[$i]["cn"][0], 'type'        =>      u );
+                                        else
+                                                $groups[$uids=$info[$i]["gidnumber"][0]] = Array('name' =>      $uids=$info[$i]["cn"][0], 'type'        =>      g ); 
+                                }
+                }
+                else{
+                $sr=ldap_search($ds, $user_context, ("(&(cn=$cn)(phpgwaccounttype=".$typeAccount."))"),$justthese);
+                $info = ldap_get_entries($ds, $sr);
+                        if($typeAccount == 'u'){ 
+                                for ($i=0; $i<$info["count"]; $i++)
+                                {
+                                        if ($info[$i]["phpgwaccountvisible"][0] == '-1')
+                                                continue;
+                                        $users[$uids=$info[$i]["uidnumber"][0]] = Array('name'  =>      $uids=$info[$i]["cn"][0], 'type'        =>      u );
+                                }
+                        }
+                        else {
+                                for ($i=0; $i<$info["count"]; $i++)     
+                                        $users[$uids=$info[$i]["gidnumber"][0]] = Array('name'  =>      $uids=$info[$i]["cn"][0], 'type'        =>      g);             
+                        
+                        }
+                }       
         }
         ldap_close($ds);
@@ -147 +162 @@
         @asort($users);
         @reset($users); 
-//      @asort($groups);
-//      @reset($groups);
+        @asort($groups);
+        @reset($groups);
 
         
@@ -155 +170 @@
         
         if($current == 'preferences'){
-                foreach($users as $id => $user_array) {
-                        if($owner != $id){
-                                $newId = 'u_'.$acl_app.'['.$id;                 
-                                $options .= '<option  value="'.$newId.'">'.utf8_decode($user_array['name']).'</option>'."\n";
+                if( count($users) > 0 ){
+                        $options .= '<option value="-1" disabled="disabled">------------------- '.lang('users').' ------------------ </option>';
+                        foreach($users as $id => $user_array) {
+                                if($owner != $id){
+                                        $newId = 'u_'.$acl_app.'['.$id;                 
+                                        $options .= '<option  value="'.$newId.'">'.utf8_decode($user_array['name']).'</option>'."\n";
+                                }
+                        }
+                }
+                if( count($groups) > 0 ){
+                        $options .= '<option value="-1" disabled="disabled">------------------- '.lang('groups').' ------------------ </option>';
+                        foreach($groups as $id => $groups_array) {
+                                if($owner != $id){
+                                        $newId = 'g_'.$acl_app.'['.$id;                 
+                                        $options .= '<option  value="'.$newId.'">'.utf8_decode($groups_array['name']).'</option>'."\n";
+                                }
                         }
                 }