Changeset 3909

Timestamp:

03/25/11 09:20:35 (12 years ago)

Author:

rafaelraymundo

Message:

Ticket #1674 - Erro ao delegar evento. Alteração anterior desfeita.

File:

• branches/2.2/expressoMail1_2/inc/class.ldap_functions.inc.php (modified) (3 diffs)

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

@@ -470 +470 @@
                     for ($i=0; $i<$info["count"]; $i++)
                         $groups[$uids=$info[$i]["gidnumber"][0]] = Array('name'    =>    $uids=$info[$i]["cn"][0], 'type'    =>    g);
-                    $justthese = array("phpgwaccountvisible","uid","cn");
+                    $justthese = array("phpgwaccountvisible","uidNumber","cn");
                     if ($params['type'] == 'search')
                        // $sr=ldap_search($this->ds, $user_context, ("(&(phpgwaccounttype=u)(!(phpgwaccountvisible=-1))(phpgwaccountstatus=A)(|(cn=*$filtro*)(mail=$filtro*)))"),$justthese);
@@ -482 +482 @@
                         if ($info[$i]["phpgwaccountvisible"][0] == '-1')
                       continue;
-                        $users[$uids=$info[$i]["uid"][0]] = Array('name'    =>    $uids=$info[$i]["cn"][0], 'type'    =>    u);
+                        $users[$uids=$info[$i]["uidnumber"][0]] = Array('name'    =>    $uids=$info[$i]["cn"][0], 'type'    =>    u);
                     }
                 }
@@ -494 +494 @@
                 $group_options ='';
 
-                /*foreach($groups as $id => $user_array) {
+                foreach($groups as $id => $user_array) {
                         $newId = $id.'U';
                         $group_options .= '<option  value="'.$newId.'">'.utf8_decode($user_array['name']).'</option>'."\n";
-                }*/
+                }
                 foreach($users as $id => $user_array) {
                     if($owner != $id){
-                        //$newId = $id.'U';
-                        $user_options .= '<option  value="'.$id.'">'.utf8_decode($user_array['name']).'</option>'."\n";
+                        $newId = $id.'U';
+                        $user_options .= '<option  value="'.$newId.'">'.utf8_decode($user_array['name']).'</option>'."\n";
                     }
                 }
-                return array("users" => $user_options /*, "groups" => $group_options*/);
+                return array("users" => $user_options, "groups" => $group_options);
         }