Changeset 1878

Timestamp:

12/18/09 16:39:06 (14 years ago)

Author:

alexandrecorreia

Message:

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

File:

• trunk/jabberit_messenger/inc/class.ldap_im.inc.php (modified) (3 diffs)

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

@@ -337 +337 @@
                                 $search1        = @ldap_search($this->ldap, $searchRoot, $filter, $justthese, 0, $this->max_result + 1);
                                 $entry1         = @ldap_get_entries( $this->ldap, $search1 );
-                                $result         = $this->resultArray( $entry1, $this->ldap );
+                                $result         = $this->resultArray( $entry1, $this->ldap, $this->ldap_org );
 
                                 if( count($return) > 0 )
@@ -367 +367 @@
         }
         
-        private final function resultArray($pArray, $pConn)
+        private final function resultArray($pArray, $pConn, $pOrg = false)
         {
                 $entry = $pArray;
@@ -384 +384 @@
                                 $ou = explode("ou=",$ou[0]);
                                 $ou = array_pop($ou);
-                                $result[$j]['ou']       = strtoupper(substr($ou,0,strlen($ou)-1));                                      
+                                $result[$j]['ou']       = strtoupper(substr($ou,0,strlen($ou)-1));
+                                if( $pOrg === "*" )
+                                        $result[$j]['ouAll'] = "*";
+                                                                                
                                 if( $entry[$i]['jpegphoto'][0] )
                                 {