Changeset 988

Timestamp:

06/12/09 17:49:55 (15 years ago)

Author:

niltonneto

Message:

Ticket #505 - Correção de busca dos usuários da própria base de dados.

Location:

trunk/jabberit_messenger/inc

Files:

• class.contacts_im.inc.php (modified) (2 diffs)
• class.db_im.inc.php (modified) (2 diffs)
• class.ldap_im.inc.php (modified) (2 diffs)

trunk/jabberit_messenger/inc/class.contacts_im.inc.php

@@ -119 +119 @@
         {   
         $array_uids = $this->db->get_accounts_acl();
-        $members = array();;
+        $members = array();
         $result = array();
-
+                
         for( $i = 0; $i < count($array_uids) ; $i+=50 )
         {   
@@ -141 +141 @@
                     $orgs = array_unique($orgs);
 
-                                foreach( $orgs as $orgB )
-                                        $result[] = $this->ldap->getUsersLdap("cn=*".$pName."*", $filter_uid, $orgB );
+                                foreach( $orgs as $orgB )                               
+                                        $result[] = $this->ldap->getUsersLdapRoot("cn=*".$pName."*", $filter_uid, $orgB );
                         }
                         else
-                    $result[] = $this->ldap->getUsersLdap("cn=*".$pName."*", $filter_uid, "" );
+                                $result[] = $this->ldap->getUsersLdapRoot("cn=*".$pName."*", $filter_uid);
         }
+        if(!$this->groupsLocked())
+                $result[] = $this->ldap->getUsersLdapCatalog("cn=*".$pName."*");
 
         if ( is_array($result) )

trunk/jabberit_messenger/inc/class.db_im.inc.php

@@ -37 +37 @@
                 $this->db_pass = $_SESSION['phpgw_info']['jabberit_messenger']['server']['db_pass'];
                 $this->db_type = $_SESSION['phpgw_info']['jabberit_messenger']['server']['db_type'];
-                $this->user_id = $_SESSION['phpgw_info']['jabberit_messenger']['user_id'];
+                $this->user_id = $_SESSION['phpgw_info']['jabberit_messenger']['user_id'];              
                 $this->connectDB();
         }
@@ -115 +115 @@
         public final function get_accounts_acl()
         {
-                $query  = "select acl_account from phpgw_acl where acl_location in (select acl_account from phpgw_acl where acl_appname = 'jabberit_messenger') ";
+                $query  = "select acl_account from phpgw_acl where acl_location in (select cast(acl_account as varchar) from phpgw_acl where acl_appname = 'jabberit_messenger') ";
                 $query .= "union select acl_account from phpgw_acl where acl_appname = 'jabberit_messenger'";
+                
                 
                 if( $this->db->query($query) )  

trunk/jabberit_messenger/inc/class.ldap_im.inc.php

@@ -156 +156 @@
         }
 
-        public final function getUsersLdap( $search, $uidnumber, $ous = false)
-        {
-                // Ldap Principal
-                $ldapRoot = $this->getUsersLdapRoot($search, $uidnumber, $ous);
-                
-                if( !$ous )
-                {
-                        // Ldap Outros
-                        $ldapCatalog = $this->getUsersLdapCatalog( $search );
-                        $ldapRoot = array_merge( $ldapRoot, $ldapCatalog );             
-                }
-                
-                return $ldapRoot;
-        }
-
-        private final function getUsersLdapCatalog( $search )
+
+        public final function getUsersLdapCatalog( $search )
         {
                 $confHosts      = $this->hostsJabber;
@@ -211 +197 @@
         }
 
-        private final function getUsersLdapRoot( $search, $uidnumber, $ous = false )
+        public final function getUsersLdapRoot( $search, $uidnumber, $ous = false )
         {
                 $this->ldapRoot();