Changeset 1438 for trunk/jabberit_messenger/inc/class.ldap_im.inc.php

Timestamp:

09/21/09 15:56:22 (15 years ago)

Author:

alexandrecorreia

Message:

Ticket #649 - Correção para liberar organização ( sub-ous ) por grupo.

File:

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

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

@@ -51 +51 @@
                 
                 $GLOBALS['phpgw_info']['server']['ldap_version3'] = true;
-
-                $this->ldap = $this->common->ldapConnect( $this->ldap_host, $this->ldap_user . "," . $this->ldap_context , $this->ldap_pass, false );
+                
+                if( $this->ldap_user && $this->ldap_pass )
+                        $this->ldap = $this->common->ldapConnect( $this->ldap_host, $this->ldap_user . "," . $this->ldap_context , $this->ldap_pass, false );
+                else
+                        $this->ldap = $this->common->ldapConnect( $this->ldap_host, $this->ldap_context , "", false );
         }
         
         private final function ldapRoot()
         {
-                $this->ldap_host        = (isset($_SESSION['phpgw_info']['jabberit_messenger']['server_ldap_jabberit'])) ? $_SESSION['phpgw_info']['jabberit_messenger']['server_ldap_jabberit'] : $GLOBALS['phpgw_info']['server']['ldap_host'];
-                $this->ldap_context     = (isset($_SESSION['phpgw_info']['jabberit_messenger']['context_ldap_jabberit'])) ? $_SESSION['phpgw_info']['jabberit_messenger']['context_ldap_jabberit'] : $GLOBALS['phpgw_info']['server']['ldap_context'];
-                $this->ldap_user        = (isset($_SESSION['phpgw_info']['jabberit_messenger']['user_ldap_jabberit'])) ? $_SESSION['phpgw_info']['jabberit_messenger']['user_ldap_jabberit'] : $GLOBALS['phpgw_info']['server']['ldap_root_dn'];
-                $this->ldap_pass        = (isset($_SESSION['phpgw_info']['jabberit_messenger']['password_ldap_jabberit'])) ? $_SESSION['phpgw_info']['jabberit_messenger']['password_ldap_jabberit'] : $GLOBALS['phpgw_info']['server']['ldap_root_pw'];
+                $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();
@@ -146 +149 @@
                 if( $this->ldap )
                 {
-                        $filter="ou=*";         
-                        $justthese = array("ou");
-                        $search = ldap_search($this->ldap,$this->ldap_context,$filter,$justthese);                      
-                        $entry = ldap_get_entries($this->ldap, $search);
-                }
-
-                foreach($entry as $tmp)
-                        if($tmp['ou'][0] != "")
-                                $result_org[] = $tmp['ou'][0];  
-
-                return $result_org;
-        }
-
+                        $filter = "(ou=*)";
+                        $justthese = array("dn");
+                        $search = ldap_search($this->ldap, $this->ldap_context, $filter, $justthese);
+                        $info = ldap_get_entries($this->ldap, $search);
+                
+                        for ($i=0; $i<$info["count"]; $i++)
+                                $a_sectors[] = $info[$i]['dn']; 
+                }
+
+                // Retiro o count do array info e inverto o array para ordenação.
+                foreach ($a_sectors as $context)
+                {
+                        $array_dn = ldap_explode_dn ( $context, 1 );
+                        $array_dn_reverse  = array_reverse ( $array_dn, true );
+                        array_pop ( $array_dn_reverse );
+                        $inverted_dn[$context] = implode ( "#", $array_dn_reverse );
+                }
+                
+                // Ordenação
+                natcasesort($inverted_dn);
+
+                foreach ( $inverted_dn as $dn=>$invert_ufn )
+                {
+            $display = '';
+
+            $array_dn_reverse = explode ( "#", $invert_ufn );
+            $array_dn  = array_reverse ( $array_dn_reverse, true );
+
+            $level = count( $array_dn ) - (int)(count(explode(",", $this->ldap_context)) + 1);
+
+            if ($level == 0)
+                    $display .= '+';
+            else 
+            {
+                                for( $i = 0; $i < $level; $i++)
+                                        $display .= '---';
+            }
+
+            reset ( $array_dn );
+            $display .= ' ' . (current ( $array_dn ) );
+                        
+                        $dn = trim(strtolower($dn));
+                        $options[$dn] = $display;
+        }
+
+            return $options;
+
+        }
 
         public final function getUsersLdapCatalog( $search )