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

Timestamp:

12/28/09 15:59:20 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #860 - Corrigir quando a autenticacao do jabber nao e pelo campo uid do ldap.

File:

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

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

@@ -20 +20 @@
 class ldap_im
 {
-        private $attr_org;
+        private $attribute;
         private $common;
         private $hostsJabber;
@@ -38 +38 @@
                 $this->ldap_pass        = $_SESSION['phpgw_info']['jabberit_messenger']['password_ldap_jabberit'];
 
-                // Attributes org ldap;
-                $this->attr_org = explode(",", $_SESSION['phpgw_info']['jabberit_messenger']['attributes_org_ldap_jabberit']);
-                
                 // Hosts Jabber
                 $this->hostsJabber = unserialize($_SESSION['phpgw_info']['jabberit_messenger']['map_org_realm_jabberit']);
@@ -47 +44 @@
                 $this->max_result = 30;
                 
+                if ( file_exists('inc/attributeLdap.php') )
+                {
+                        require_once('attributeLdap.php');
+                        $this->attribute = trim($attributeTypeName);
+                }
         }
 
@@ -333 +335 @@
                         {
                                 $filter         = ( $uid ) ? "(&(phpgwaccounttype=u)(|".$uid.")(".$search ."))" : "(&(phpgwaccounttype=u)(".$search ."))";
-                                $justthese      = array("uid","uidNumber","cn","mail","phpgwAccountVisible","dn","jpegPhoto");                                                          
+                                $justthese      = array( $this->attribute ,"uidNumber" ,"cn" ,"mail" ,"phpgwAccountVisible" ,"dn" ,"jpegPhoto" );                                                               
                                 $searchRoot     = ( $this->ldap_org != "*" ) ? "ou=".$this->ldap_org.",".$this->ldap_context : $this->ldap_context;
                                 $search1        = @ldap_search($this->ldap, $searchRoot, $filter, $justthese, 0, $this->max_result + 1);
@@ -358 +360 @@
                         $searchRoot     = ( $ous ) ? $ous.",".$this->ldap_context : $this->ldap_context ;
                         $filter         = "(&(phpgwaccounttype=u)(|".$uidnumber.")(".$search ."))";
-                        $justthese      = array("uid","uidNumber","cn","mail","phpgwAccountVisible","dn","jpegPhoto");                                                          
+                        $justthese      = array( $this->attribute, "uidNumber", "cn", "mail", "phpgwAccountVisible", "dn", "jpegPhoto" );                                                               
                         $search         = ldap_search( $this->ldap, $searchRoot, $filter, $justthese, 0, $this->max_result + 1);
                         $entry          = ldap_get_entries( $this->ldap, $search );
@@ -369 +371 @@
         private final function resultArray($pArray, $pConn, $pOrg = false)
         {
-                $entry = $pArray;
-                $result = array();
-
-                $j = 0;
-                for($i = 0 ; $i < $entry['count']; $i++)
+                $entry  = $pArray;
+                $result = array();
+                $j              = 0;
+                
+                for( $i = 0 ; $i < $entry['count']; $i++ )
                 {
                         if ( $entry[$i]['phpgwaccountvisible'][0] != '-1' )
                         {
-                                $result[$j]['uidnumber'] = $entry[$i]['uidnumber'][0];                  
-                                $result[$j]['mail']     =  $entry[$i]['mail'][0];
-                                $result[$j]['uid']      =  $entry[$i]['uid'][0];
-                                $result[$j]['jid']      = $entry[$i]['uid'][0];
+                                $result[$j]['uidnumber']        = $entry[$i]['uidnumber'][0];                   
+                                $result[$j]['mail']                     = $entry[$i]['mail'][0];
+                                $result[$j]['uid']                      = $entry[$i][$this->attribute][0];
+                                $result[$j]['jid']                      = $entry[$i][$this->attribute][0];
+                                
                                 $ou = explode("dc=", $entry[$i]['dn']);
                                 $ou = explode("ou=",$ou[0]);
                                 $ou = array_pop($ou);
                                 $result[$j]['ou']       = strtoupper(substr($ou,0,strlen($ou)-1));
+                                
                                 if( $pOrg === "*" )
                                         $result[$j]['ouAll'] = "*";
@@ -404 +408 @@
                 
                         $organization = $this->attr_org;
-        
-                        if(is_array($organization))
-                        {
-                                foreach($organization as $attr)
-                                {
-                                        $tmp = explode(";",$attr);
-                                        if( strtolower(trim($tmp[0])) == strtolower(trim($result[$i]['dn'])) )
-                                        {
-                                                switch(strtolower(trim($tmp[1])))
-                                                {
-                                                        case "mail" :
-                                                                        $uid = $result[$i]['mail'];
-                                                                        $uid = substr($uid,0,strpos($uid,"@")); 
-                                                                        $result[$i]['uid'] = $uid;
-                                                                        break;
-        
-                                                        case "description" :
-                                                                        // SERPRO
-                                                                        // parte antes do arroba; 
-                                                                        $result[$i]['uid'] = $result[$i]['description'];                                                                                
-                                                                        break;
-                                                }
-                                        }
-                                }
-                        }
-                }
+                }
+                
                 return $result;
         }