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

Timestamp:

01/05/09 09:25:35 (15 years ago)

Author:

niltonneto

Message:

Correções referentes ao release 0.7.10

File:

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

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

@@ -25 +25 @@
         private $jid;
         private $max_result;
+        private $ou_User;
         
         public final function __construct()
         {
-                $this->ldap_host        = $_SESSION['phpgw_info']['jabberit_messenger']['server_ldap_jabberit'];
-                $this->ldap_context     = $_SESSION['phpgw_info']['jabberit_messenger']['context_ldap_jabberit'];
-                $this->ldap_dn          = $_SESSION['phpgw_info']['jabberit_messenger']['user_ldap_jabberit'];
-                $this->ldap_pass        = $_SESSION['phpgw_info']['jabberit_messenger']['password_ldap_jabberit'];
+                $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_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->jid                      = $_SESSION['phpgw_info']['jabberit_messenger']['user'];
                 $this->max_result       = 50;
+                
+                // Ou User
+                $this->ou_User = $_SESSION['phpgw_info']['jabberit_messenger']['account_dn'];
+                $this->ou_User = substr($this->ou_User,strpos($this->ou_User, "ou="));
+                $this->ou_User = strtoupper(substr($this->ou_User, 0, strpos($this->ou_User, ",dc=")));
         }
 
@@ -49 +55 @@
                 {
                         $GLOBALS['phpgw_info']['server']['ldap_version3'] = true;
-                        $this->ldap = $this->common->ldapConnect( $this->ldap_host,$this->ldap_dn,$this->ldap_pass, true );
+                        $this->ldap = $this->common->ldapConnect( $this->ldap_host,$this->ldap_dn,$this->ldap_pass, false );
                 }
         }
@@ -150 +156 @@
         }
 
-        public final function list_users_ldap($search, $uidnumber)
+        public final function list_users_ldap($search, $uidnumber, $groupsDeny)
         {
                 $this->_connect_ldap();
@@ -159 +165 @@
                         $justthese = array("uid","uidNumber","cn","mail","phpgwAccountVisible","dn","jpegPhoto");
                         // SERPRO
-                        //$justthese = array("uid","uidNumber","cn","mail","description","phpgwAccountVisible","dn","jpegPhoto");                       
-                        $search = ldap_search($this->ldap,$this->ldap_context,$filter,$justthese, 0, $this->max_result + 1);
+                        //$justthese = array("uid","uidNumber","cn","mail","description","phpgwAccountVisible","dn","jpegPhoto");
+                        if( $groupsDeny )                       
+                                $search = ldap_search($this->ldap,$this->ou_User.",".$this->ldap_context,$filter,$justthese, 0, $this->max_result + 1);
+                        else
+                                $search = ldap_search($this->ldap,$this->ldap_context,$filter,$justthese, 0, $this->max_result + 1);
                         $entry1 = ldap_get_entries($this->ldap,$search);
                         $entry = ldap_first_entry( $this->ldap, $search );
@@ -243 +252 @@
         }
         
-        public final function list_organizations_ldap()
-        {
-                $result_org = "<organizations>";
+        public final function listOrganizationsLdap()
+        {
 
                 $this->_connect_ldap();
@@ -259 +267 @@
                 foreach($entry as $tmp)
                         if($tmp['ou'][0] != "")
-                                $result_org .= "<ou>" . $tmp['ou'][0] . "</ou>";  
-
-                $result_org .= "</organizations>";
-                
+                                $result_org[] = $tmp['ou'][0];  
+
                 return $result_org;
         }
+        
+        public final function getGroupsLdap($pOrg)
+        {
+                $this->_ldapConnect(true);
+                $organization = 'ou=' . $pOrg['ou'] .",". $this->ldap_context;
+                
+                if( $this->ldap )       
+                {
+                        $filter = "(&(phpgwAccountType=g)(objectClass=posixGroup))";
+                        $justthese = array("cn","gidNumber");
+                        $search = ldap_list($this->ldap, $organization, $filter, $justthese);
+                        $entry = ldap_get_entries( $this->ldap, $search );
+
+                        if( $entry )
+                        {                                       
+                                $result_groups = "<ldap>";
+                                foreach($entry as $tmp)
+                                        if( $tmp['gidnumber'][0] != "" )
+                                                $result_groups .= "<org><cn>".$tmp['cn'][0]."</cn><gid>".$tmp['gidnumber'][0]."</gid></org>";
+                                
+                                $result_groups .= "</ldap>";                                            
+                        }
+                }
+
+                return $result_groups;
+        }
+
 }