Changeset 24 for trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php

Timestamp:

05/10/07 11:51:20 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

File:

• trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php (modified) (5 diffs)

trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php

@@ -694 +694 @@
                 {
                         $justthese = array("cn","uid","uidnumber");
-                        $filter="(&(phpgwAccountType=u)(uid=".$entry[0]['memberuid'][$i]."))";
+                        
+                        // Montagem dinamica do filtro
+                        $filter="(&(phpgwAccountType=u)(|";
+                        for ($k=0; (($k<10) && ($i<$entry[0]['memberuid']['count'])); $k++)
+                        {
+                                $filter .= "(uid=".$entry[0]['memberuid'][$i].")";
+                                $i++;
+                        }
+                        $i--;
+                        $filter .= "))";
+                        
                         $search = ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_context'], $filter, $justthese);
                         $user_entry = ldap_get_entries($this->ldap, $search);
 
-                        if ($user_entry[0]['uid'][0] == '')
-                        {
-                                $result['memberuid_info'][$i]['cn'] = '0-UID NAO EXISTE, corrigir manualmente: ' . $entry[0]['memberuid'][$i];
-                                $result['memberuid_info'][$i]['uid'] = $entry[0]['memberuid'][$i];
-                                $result['memberuid_info'][$i]['uidnumber'] = $entry[0]['memberuid'][$i];
-                        }
-                        else
-                        {
-                                $result['memberuid_info'][$i]['cn'] = $user_entry[0]['cn'][0];
-                                $result['memberuid_info'][$i]['uid'] = $user_entry[0]['uid'][0];
-                                $result['memberuid_info'][$i]['uidnumber'] = $user_entry[0]['uidnumber'][0];
-                        }
+                        for ($j=0; $j<$user_entry['count']; $j++)
+                        {
+                                $result['memberuid_info'][$user_entry[$j]['uid'][0]]['cn'] = $user_entry[$j]['cn'][0];
+                                $result['memberuid_info'][$user_entry[$j]['uid'][0]]['uidnumber'] = $user_entry[$j]['uidnumber'][0];
+                                $result['memberuid_info'][$user_entry[$j]['uid'][0]]['type'] = 'u';
+                        }
+                }
+                
+                // Retira o count do array
+                array_shift($entry[0]['memberuid']);
+                
+                // Checamos e-mails que não fazem parte do expresso.
+                // Criamos um array temporario
+                $tmp_array = array();
+                foreach ($result['memberuid_info'] as $uid => $user_data)
+                {
+                        $tmp_array[] = $uid;
+                }
+
+                // Vemos a diferença
+                $array_diff = array_diff($entry[0]['memberuid'], $tmp_array);
+                
+                // Incluimos no resultado
+                foreach ($array_diff as $index=>$uid)
+                {
+                        $result['memberuid_info'][$uid]['cn'] = $uid;
                 }
                 
@@ -718 +742 @@
                                 $result['sambaGroup'] = true;
                 }
+
                 return $result;
         }       
@@ -726 +751 @@
                 $search = ldap_search($this->ldap, $context, $filter);
                 $entry = ldap_get_entries($this->ldap, $search);
-
+        
                 //Pega o dn do setor do usuario.
                 $entry[0]['dn'] = strtolower($entry[0]['dn']);
@@ -734 +759 @@
                 //Retira ultimo pipe.
                 $sector_dn = substr($sector_dn,0,(strlen($sector_dn) - 1));
-                
+                        
                 $result['context']                              = $sector_dn;
                 $result['uidnumber']                    = $entry[0]['uidnumber'][0];
@@ -742 +767 @@
                 $result['accountStatus']                = $entry[0]['accountstatus'][0];
                 $result['phpgwAccountVisible']  = $entry[0]['phpgwaccountvisible'][0];
-                
+                        
                 //Members
                 for ($i=0; $i<$entry[0]['mailforwardingaddress']['count']; $i++)
                 {
-                        $justthese = array("cn", "uidnumber", "uid", "phpgwaccounttype");
-                        $filter="(&(|(phpgwAccountType=u)(phpgwAccountType=l))(mail=".$entry[0]['mailforwardingaddress'][$i]."))";
+                        $justthese = array("cn", "uidnumber", "uid", "phpgwaccounttype", "mail");
+                                
+                        // Montagem dinamica do filtro
+                        $filter="(&(|(phpgwAccountType=u)(phpgwAccountType=l))(|";
+                        for ($k=0; (($k<10) && ($i<$entry[0]['mailforwardingaddress']['count'])); $k++)
+                        {
+                                $filter .= "(mail=".$entry[0]['mailforwardingaddress'][$i].")";
+                                $i++;
+                        }
+                        $i--;
+                        $filter .= "))";
+                                
                         $search = ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_context'], $filter, $justthese);
                         $user_entry = ldap_get_entries($this->ldap, $search);
-                        
-                        if ($user_entry['count'] != 0)
-                        {
-                                $result['members_info'][$user_entry[0]['uidnumber'][0]]['uid'] = $user_entry[0]['uid'][0];
-                                $result['members_info'][$user_entry[0]['uidnumber'][0]]['cn'] = $user_entry[0]['cn'][0];
-                                $result['members_info'][$user_entry[0]['uidnumber'][0]]['type'] = $user_entry[0]['phpgwaccounttype'][0];
-                                $result['members_info'][$user_entry[0]['uidnumber'][0]]['mailforwardingaddress'] = $entry[0]['mailforwardingaddress'][$i];
-                                $result['members'][] = $user_entry[0]['uidnumber'][0];
-                        }
-                        else
-                        {
-                                $result['members_info'][$entry[0]['mailforwardingaddress'][$i]]['uid'] = $entry[0]['mailforwardingaddress'][$i];
-                                $result['members_info'][$entry[0]['mailforwardingaddress'][$i]]['cn'] = 'E-Mail nao encontrado (' . $entry[0]['mailforwardingaddress'][$i] . ')';
-                                $result['members_info'][$entry[0]['mailforwardingaddress'][$i]]['mailforwardingaddress'] = $entry[0]['mailforwardingaddress'][$i];
-                                $result['members'][] = $entry[0]['mailforwardingaddress'][$i];
-                        }
-                }
-                
-                return $result;
+                                
+                        for ($j=0; $j<$user_entry['count']; $j++)
+                        {
+                                $result['members_info'][$user_entry[$j]['uidnumber'][0]]['uid'] = $user_entry[$j]['uid'][0];
+                                $result['members_info'][$user_entry[$j]['uidnumber'][0]]['cn'] = $user_entry[$j]['cn'][0];
+                                $result['members_info'][$user_entry[$j]['uidnumber'][0]]['type'] = $user_entry[$j]['phpgwaccounttype'][0];
+                                $result['members_info'][$user_entry[$j]['uidnumber'][0]]['mail'] = $user_entry[$j]['mail'][0];
+                                $result['members'][] = $user_entry[$j]['uidnumber'][0];
+                        }
+                }
+
+                // Retira o count do array
+                array_shift($entry[0]['mailforwardingaddress']);
+
+                // Checamos e-mails que não fazem parte do expresso.
+                // Criamos um array temporario
+                $tmp_array = array();
+                foreach ($result['members_info'] as $uid => $user_data)
+                {
+                        $tmp_array[] = $user_data['mail'];
+                }
+
+                // Vemos a diferença
+                $array_diff = array_diff($entry[0]['mailforwardingaddress'], $tmp_array);
+
+                // Incluimos no resultado
+                foreach ($array_diff as $index=>$mailforwardingaddress)
+                {
+                        $result['members_info'][$mailforwardingaddress]['uid'] = $mailforwardingaddress;
+                        $result['members_info'][$mailforwardingaddress]['cn'] = 'E-Mail nao encontrado';
+                        $result['members_info'][$mailforwardingaddress]['mailforwardingaddress'] = $mailforwardingaddress;
+                        $result['members'][] = $mailforwardingaddress;
+                }
+                return $result; 
         }