Changeset 1881

Timestamp:

12/22/09 09:38:07 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #808 - Busca implementada utilizando somente os grupos cadastrados.

Location:

trunk/jabberit_messenger/inc

Files:

• class.contacts_im.inc.php (modified) (7 diffs)
• class.db_im.inc.php (modified) (1 diff)
• class.ldap_im.inc.php (modified) (1 diff)

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

@@ -17 +17 @@
 class contacts_im
 {
-        private $ldap;
         private $db;
         private $dn_User;
+        private $hostsJabberLdap;       
+        private $ldap;
         private $ou_User;
         private $serverJabber;
@@ -41 +42 @@
         
                 // Server Name Ldap
-                $this->serverLdap       = $_SESSION['phpgw_info']['jabberit_messenger']['server_ldap_jabberit'];        
+                $this->serverLdap       = $_SESSION['phpgw_info']['jabberit_messenger']['server_ldap_jabberit'];
+                
+                // Hosts Jabber / Ldap
+                $this->hostsJabberLdap = unserialize($_SESSION['phpgw_info']['jabberit_messenger']['map_org_realm_jabberit']);  
         }
 
@@ -132 +136 @@
         $uidType                = "uid";
                 $serversLdap    = unserialize(trim($_SESSION['phpgw_info']['jabberit_messenger']['groups_search']));
-
+                
         if( $serversLdap )
         {
@@ -151 +155 @@
                                 }
                 }
-                
         }                               
                 
@@ -159 +162 @@
                 $uidType = "uidnumber"; 
         }        
-        
+
         for( $i = 0; $i < count($array_uids) ; $i+=50 )
         {   
@@ -200 +203 @@
                         $array_uids_external = array();
 
-                        if( $serversLdap )
+                        unset($serversLdap[$this->serverLdap]);
+
+                        if( $serversLdap  && count($serversLdap))
                         {
                                 foreach( $serversLdap as $key => $tmp )
                                 {
-                                        if( $key != $this->serverLdap )
+                                        $groupsExternal = unserialize($tmp);
+
+                                        if( count($groupsExternal) )
                                         {
-                                                $groupsExternal = unserialize($tmp);
-
-                                                if(count($groupsExternal))
-                                                {
-                                                        foreach( $groupsExternal as $tmpExt )
-                                                        {
-                                                                $group = explode(":",$tmpExt);
-                                                                $array_result = $this->ldap->getGroupsMemberUid( $group[0], $key );
-                                                                @array_shift($array_result[0]['memberuid']);
-                                                                $array_uids_external = @array_merge($array_uids_external, $array_result[0]['memberuid']);
-                                                                unset($array_result);
-                                                        }
-                                                        
-                                                        for( $i = 0; $i < count( $array_uids_external ) ; $i+=50 )
-                                                {   
-                                                $partial_uids_external  = array_slice($array_uids_external,$i,50);
-                                                $filter_uid_external    = implode(")(uid=",$partial_uids_external);
-                                                $filter_uid_external    = "(uid=". $filter_uid_external. ")";
-                                                $result[] = $this->ldap->getUsersLdapCatalog("cn=*".$pName."*", $filter_uid_external, $key );
-                                                }
-                                                unset($array_uids_external);
-                                                }
+                                                foreach( $groupsExternal as $tmpExt )
+                                                {
+                                                        $group = explode(":",$tmpExt);
+                                                        $array_result = $this->ldap->getGroupsMemberUid( $group[0], $key );
+                                                        @array_shift($array_result[0]['memberuid']);
+                                                        $array_uids_external = @array_merge($array_uids_external, $array_result[0]['memberuid']);
+                                                        unset($array_result);
+                                                }
+                                                
+                                                for( $i = 0; $i < count( $array_uids_external ) ; $i+=50 )
+                                        {   
+                                        $partial_uids_external  = array_slice($array_uids_external,$i,50);
+                                        $filter_uid_external    = implode(")(uid=",$partial_uids_external);
+                                        $filter_uid_external    = "(uid=". $filter_uid_external. ")";
+                                        $result[] = $this->ldap->getUsersLdapCatalog("cn=*".$pName."*", $filter_uid_external, $key );
+                                        }
+                                        unset($array_uids_external);
                                         }
-                                }                                       
-                        }
-                        else
-                        {
-                                $result[] = $this->ldap->getUsersLdapCatalog("cn=*".$pName."*");
+                                        
+                                }
+                        }
+                        
+                        if( count($this->hostsJabberLdap) )
+                        {
+                                for($i = 0 ; $i < count($this->hostsJabberLdap); $i++)
+                                {
+                                        if( !array_key_exists($this->hostsJabberLdap[$i]['serverLdap'], $serversLdap) )
+                                                $result[] = $this->ldap->getUsersLdapCatalog("cn=*".$pName."*", false, $this->hostsJabberLdap[$i]['serverLdap'] );
+                                }
                         }
         }
@@ -247 +255 @@
         {
                 $ou = substr( $this->ou_User, strpos($this->ou_User, "=") + 1 );
+                
                         for($i = 0 ; $i < count($members); $i++ )
                         {
                                 if( $ou == $members[$i]['ou'] )
+                                {
                                         $uids_org[] = $members[$i];
+                                }
                                 else
+                                {
                                         if(isset($_SESSION['phpgw_info']['jabberit_messenger']['photo']))
                                                 unset($_SESSION['phpgw_info']['jabberit_messenger']['photo'][$members[$i]['ou']]);
-                        }
+                                }
+                        }
+                        
                         return $uids_org;
         }            

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

@@ -336 +336 @@
                                 else
                                 {
-                                        $resultQuery = unserialize($result[0]['config_value']);
-                                        $keys = array_keys($pData);
-
-                                        $resultQuery[$keys[0]] = $pData[$keys[0]];
-
-                                        $query = "UPDATE phpgw_config SET config_value = '".serialize($resultQuery)."' WHERE config_app = 'phpgwapi' AND config_name = 'groups_search_jabberit';";
+                                        $keyLdap = array_keys($pData);
+                                        $resultQuery = unserialize($result[0]['config_value']);                                 
+                                        
+                                        if( is_array(unserialize($pData[$keyLdap[0]])) )
+                                                $resultQuery[$keyLdap[0]] = $pData[$keyLdap[0]];
+                                        else
+                                                unset($resultQuery[$keyLdap[0]]);
+
+                                        if( count($resultQuery))
+                                                $query = "UPDATE phpgw_config SET config_value = '".serialize($resultQuery)."' WHERE config_app = 'phpgwapi' AND config_name = 'groups_search_jabberit';";
+                                        else
+                                                $query = "DELETE FROM phpgw_config WHERE config_app = 'phpgwapi' AND config_name = 'groups_search_jabberit';";
+                                                
                                         $this->db->query($query);
                                         return true;

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

@@ -52 +52 @@
         {
                 if( $this->ldap )
-                        ldap_close($this->ldap);
+                        @ldap_close($this->ldap);
         }