Changeset 1853 for trunk/jabberit_messenger

Timestamp:

12/16/09 16:04:54 (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) (4 diffs)
• class.ldap_im.inc.php (modified) (3 diffs)

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

@@ -138 +138 @@
                                 {
                                         $group = explode(":",$tmp);
-                                        $array_uids = array_merge($array_uids, $this->ldap->getGroupsMemberUid($group[0], $this->serverLdap ));
+                                        $array_result = $this->ldap->getGroupsMemberUid($group[0], $this->serverLdap );
+                                        array_shift($array_result[0]['memberuid']);
+                                        $array_uids = array_merge($array_uids, $array_result[0]['memberuid']);
+                                        unset($array_result);
                                 }
                 }
+                
         }                               
 
@@ -201 +205 @@
                                                         {
                                                                 $group = explode(":",$tmpExt);
-                                                                $array_uids_external = @array_merge($array_uids_external, $this->ldap->getGroupsMemberUid( $group[0], $key ));
+                                                                $array_result = $this->ldap->getGroupsMemberUid($group[0], $group[0], $key );
+                                                                array_shift($array_result[0]['memberuid']);
+                                                                $array_uids_external = array_merge($array_uids_external, $array_result[0]['memberuid']);
+                                                                unset($array_result);
+                                                                //$array_uids_external = @array_merge($array_uids_external, $this->ldap->getGroupsMemberUid( $group[0], $key ));
                                                         }
                                                         
@@ -263 +271 @@
         public final function verifyAddNewContact($pUid)
         {
-                $groupsLocked =  explode(";",$_SESSION['phpgw_info']['jabberit_messenger']['groups_locked']);
-                $gidNumbers = array();
-                $uid = $pUid['uid'];
-                $uid_User = substr($this->dn_User, 0, strpos($this->dn_User, ","));
-                $uid_User = substr($uid_User, 4);
-
+                $groupsLocked   = explode(";",$_SESSION['phpgw_info']['jabberit_messenger']['groups_locked']);
+                $gidNumbers             = array();
+                $uid                    = $pUid['uid'];
+                $uid_User               = substr($this->dn_User, 0, strpos($this->dn_User, ","));
+                $uid_User               = substr($uid_User, 4);
+                
                 foreach($groupsLocked as $tmp)
                 {
@@ -274 +282 @@
                         $gidNumbers[] = $groups[1];
                 }
-                
+
                 $filter_gid = implode(")(gidnumber=",$gidNumbers);
             $filter_gid = "(gidnumber=". $filter_gid. ")";
-                
-                $result = $this->ldap->getGroupsMemberUid($filter_gid);
-                
+        
+                $result = $this->ldap->getGroupsMemberUid( $filter_gid, "localhost" );
+
                 if( $result && is_array($result) )
                 {

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

@@ -175 +175 @@
                         if( $this->ldap )
                         {
-                                $filter = "(&(objectclass=posixgroup)(cn=".$pGroup."))";
-                                $justthese = array("memberuid","gidnumber");
-                                $search = ldap_search($this->ldap,$this->ldap_context,$filter, $justthese);
+                                $filter = "(&(objectclass=posixgroup)(|".$pGroup."))";
+                                if( strpos($pGroup, "gidnumber") === false )
+                                        $filter = "(&(objectclass=posixgroup)(cn=".$pGroup."))";
+                                        
+                                $justthese = array("dn","memberuid","gidnumber");
+                                $search = ldap_search($this->ldap, $this->ldap_context, $filter, $justthese);
                                 $result = ldap_get_entries($this->ldap,$search);
                         }
@@ -203 +206 @@
                                         {
                                                 $filter = "(&(objectclass=posixgroup)(cn=".$pGroup."))";
-                                                $justthese = array("memberuid","gidnumber");
+                                                $justthese = array("dn","memberuid","gidnumber");
                                                 $search = ldap_search($this->ldap,$this->ldap_context,$filter, $justthese);
                                                 $result = ldap_get_entries($this->ldap,$search);
@@ -212 +215 @@
 
                 if( $result['count'] > 0 )
+                        return $result;
+
+                /*      
+                if( $result['count'] > 0 )
                 {
                         array_shift($result[0]['memberuid']);
                         return $result[0]['memberuid'];
                 }
-
+                */
+                
                 return false;
         }