Changeset 3260 for branches/2.2/jabberit_messenger/jmessenger/inc/class.LdapIM.inc.php

Timestamp:

09/17/10 11:11:28 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #1316 - Correcoes e melhorias na busca dos contatos para o Modulo IM.

File:

• branches/2.2/jabberit_messenger/jmessenger/inc/class.LdapIM.inc.php (modified) (8 diffs)

branches/2.2/jabberit_messenger/jmessenger/inc/class.LdapIM.inc.php

@@ -42 +42 @@
                 
                 // Result Ldap
-                $this->max_result = 20;
+                $this->max_result = 15;
                 
                 if ( file_exists('inc/attributeLdap.php') )
@@ -73 +73 @@
         private final function ldapRoot()
         {
+                $this->ldap_host        = $_SESSION['phpgw_info']['jabberit_messenger']['server_ldap_jabberit'];
+                $this->ldap_context     = $_SESSION['phpgw_info']['jabberit_messenger']['context_ldap_jabberit'];
+                $this->ldap_user        = $_SESSION['phpgw_info']['jabberit_messenger']['user_ldap_jabberit'];
+                $this->ldap_pass        = $_SESSION['phpgw_info']['jabberit_messenger']['password_ldap_jabberit'];
+
                 $this->ldapConn();
         }
@@ -102 +107 @@
 
                 return $conn;
+        }
+        
+        private function getLdapHost()
+        {
+                return  $_SESSION['phpgw_info']['jabberit_messenger']['server_ldap_jabberit'];
         }
 
@@ -169 +179 @@
 
                 return $result_groups;
+        }
+
+        public final function getMaxResults()
+        {
+                return $this->max_result;
+        }
+
+        public final function getMembers( $pMembers, $pServers )
+        {
+                $members = $pMembers;
+                
+                foreach( $pServers as $servers => $groups )
+                {
+                        if( $servers == $this->getLdapHost() || $servers == 'localhost')
+                        {
+                                $this->ldapRoot();
+                                
+                                $count = count($members[$servers]);
+                                
+                                for( $i = 0; $i < $count; $i++ )
+                                {
+                                        if ( ! $this->getMemberUid($groups, $members[$servers][$i]['uid'] ) )
+                                                unset( $members[$servers][$i] );
+                                }
+
+                                if( $this->ldap )
+                                        @ldap_close($this->ldap);
+                        }
+                        else
+                        {
+                                $confHosts      = $this->hostsJabber;
+                        
+                                for($i = 0; $i < count($confHosts); $i++ )
+                                {
+                                        if( $this->ldap )
+                                                @ldap_close($this->ldap);
+                                                
+                                        if( trim($servers) === trim($confHosts[$i]['serverLdap']) )
+                                        {
+                                                $this->ldap_host        = $confHosts[$i]['serverLdap'];
+                                                $this->ldap_context = $confHosts[$i]['contextLdap'];
+                                                $this->ldap_user        = $confHosts[$i]['user'];
+                                                $this->ldap_org         = $confHosts[$i]['org'];
+                                                $this->ldap_pass        = $confHosts[$i]['password'];
+                                                $this->ldap             = $this->ldapCatalog();
+
+                                                $count = count($members[$servers]);
+                                                
+                                                for( $i = 0; $i < $count; $i++ )
+                                                {
+                                                        if ( ! $this->getMemberUid($groups, $members[$servers][$i]['uid'] ) )
+                                                                unset( $members[$servers][$i] );
+                                                }
+                
+                                                if( $this->ldap )
+                                                        @ldap_close($this->ldap);
+                                        }
+                                }
+                        }
+                }
+                
+                return $members;
+        }
+
+        private function getMemberUid( $pGidNumber, $pMemberUid )
+        {
+                $filter         = "(&(phpgwAccountType=g)(|{$pGidNumber})(memberuid={$pMemberUid}))";
+                $justthese      = array("memberuid");
+        
+                if( $this->ldap )
+                {
+                        $search = ldap_search($this->ldap, $this->ldap_context, $filter, $justthese );
+                        $result = ldap_get_entries($this->ldap,$search);
+                        if( $result["count"] )
+                                return true;
+                }
+
+                return false;
         }
 
@@ -360 +448 @@
         }
 
-        public final function getUsersLdapCatalog( $search, $uid = false, $pLdap = false )
+        public final function getUsersLdapCatalog( $search, $pLdap = false, $uid = false )
         {
                 $confHosts      = $this->hostsJabber;
@@ -390 +478 @@
                                         $return = array_merge($return, $result);
                                         else
-                                                $return = $result;                              
+                                                $return = $result;
                                 }
                                 
@@ -401 +489 @@
         }
 
-        public final function getUsersLdapRoot( $search, $uidnumber, $ous = false )
-        {
+        public final function getUsersLdapRoot( $search, $uidnumber = false, $ous = false )
+        {
+                
                 $result = array();
                 $this->ldapRoot();
@@ -409 +498 @@
                 {
                         $searchRoot     = ( $ous ) ? $ous.",".$this->ldap_context : $this->ldap_context ;
-                        $filter         = "(&(phpgwaccounttype=u)(|".$uidnumber.")(".$search ."))";
+                        $filter         = ($uidnumber) ? "(&(phpgwaccounttype=u)(|".$uidnumber.")(".$search ."))" : "(&(phpgwaccounttype=u)(".$search ."))";
                         $justthese      = array( $this->attribute, "uidNumber", "cn", "mail", "phpgwAccountVisible", "dn", "jpegPhoto" );                                                               
                         $search         = @ldap_search( $this->ldap, $searchRoot, $filter, $justthese, 0, $this->max_result + 1);