Changeset 1198 for branches/2.0/jabberit_messenger/inc/class.ldap_im.inc.php

Timestamp:

07/27/09 14:04:22 (15 years ago)

Author:

niltonneto

Message:

Ticket #586 - Correções para adaptar template e funcionar com API 2.0

File:

• branches/2.0/jabberit_messenger/inc/class.ldap_im.inc.php (modified) (9 diffs)

branches/2.0/jabberit_messenger/inc/class.ldap_im.inc.php

@@ -22 +22 @@
         private $ldap;
         private $ldap_context;
-        private $ldap_dn;
+        private $ldap_user;
         private $ldap_host;
         private $ldap_org;
@@ -52 +52 @@
                 $GLOBALS['phpgw_info']['server']['ldap_version3'] = true;
 
-                $this->ldap = $this->common->ldapConnect( $this->ldap_host, $this->ldap_dn, $this->ldap_pass, false );
+                $this->ldap = $this->common->ldapConnect( $this->ldap_host, $this->ldap_user . "," . $this->ldap_context , $this->ldap_pass, false );
         }
         
@@ -59 +59 @@
                 $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_dn          = (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_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'];
 
@@ -83 +83 @@
 
                 // Bind as Admin
-                if($this->ldap_dn && $this->ldap_pass && !ldap_bind($conn, $this->ldap_dn, $this->ldap_pass))
+                if($this->ldap_user && $this->ldap_pass && !ldap_bind($conn, $this->ldap_user . "," .$this->ldap_context, $this->ldap_pass))
                         return false;
                 
                 // Bind as Anonymous
-                if(!$this->ldap_dn && !$this->ldap_pass && !@ldap_bind($conn))
-                        return false;
-                        
+                if(!$this->ldap_user && !$this->ldap_pass && !@ldap_bind($conn))
+                        return false;
+
                 return $conn;
         }
@@ -96 +96 @@
         {
                 $this->ldapRoot();
-
-                if( $this->ldap )       
+                $result_groups = "";
+
+                if( $this->ldap && $pOrg['ou'] != "-1") 
                 {
                         $organization = 'ou=' . $pOrg['ou'] .",". $this->ldap_context;
@@ -114 +115 @@
                                 $result_groups .= "</ldap>";                                            
                         }
-                }
-
+                        
+                        return $result_groups;
+                }
+                
                 return $result_groups;
         }
@@ -140 +143 @@
         {
                 $this->ldapRoot();
-        
+                
                 if( $this->ldap )
                 {
@@ -168 +171 @@
                         $this->ldap_host        = $confHosts[$i]['serverLdap'];
                         $this->ldap_context = $confHosts[$i]['contextLdap'];
-                        $this->ldap_dn          = $confHosts[$i]['user'];
+                        $this->ldap_user        = $confHosts[$i]['user'];
                         $this->ldap_org         = $confHosts[$i]['org'];
                         $this->ldap_pass        = $confHosts[$i]['password'];
@@ -179 +182 @@
                                 $justthese = array("uid","uidNumber","cn","mail","phpgwAccountVisible","dn","jpegPhoto");                                                               
                                 $searchRoot = ( $this->ldap_org != "*" ) ? "ou=".$this->ldap_org.",".$this->ldap_context : $this->ldap_context;
+                                
                                 $search1 = @ldap_search($conn, $searchRoot, $filter, $justthese, 0, $this->max_result + 1);
                                 $entry1 = @ldap_get_entries( $conn, $search1 );
                                 $result = $this->resultArray($entry1, $conn );
-
+                                
                                 if( count($return) > 0 )
                                 $return = array_merge($return, $result);