Changeset 1900 for trunk/jabberit_messenger/inc/webservice.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/webservice.php (modified) (8 diffs)

trunk/jabberit_messenger/inc/webservice.php

@@ -13 +13 @@
 class webService
 {
+        private $attribute;
         private $conn;
         private $contextLdap;
@@ -23 +24 @@
         private $fileLdapInternal = false;
         private $fileLdapExternal = false;
+        private $version3;
         
         function __construct()
@@ -42 +44 @@
                         $this->fileLdapInternal = true;
                 }
+                
+                $this->attribute = "uid";
+                
+                if ( file_exists('attributeLdap.php') )
+                {
+                        require_once('attributeLdap.php');
+                        $this->attribute = trim($attributeTypeName);
+                }
         }
         
@@ -54 +64 @@
                 if( $this->version3 )
                         if( !ldap_set_option($this->conn,LDAP_OPT_PROTOCOL_VERSION,3) )
-                                $this->version = false;
+                                $this->version3 = false;
 
                 ldap_set_option($this->conn, LDAP_OPT_REFERRALS, $this->refer);
@@ -179 +189 @@
                                 if( $this->conn )
                                 {
-                                        $filter = "(&(phpgwaccounttype=u)(uid=".$uid.")(!(phpgwaccountvisible=-1)))";
-                                        $justthese = array("uid","cn","dn");
+                                        $filter = "(&(phpgwaccounttype=u)(".$this->attribute."=".$uid.")(!(phpgwaccountvisible=-1)))";
+                                        $justthese = array($this->attribute,"cn","dn");
                                         $search = ldap_search( $this->conn, $this->contextLdap, $filter,$justthese);
                                         $get_entries = ldap_get_entries( $this->conn, $search);
@@ -204 +214 @@
                                 if( $this->conn )
                                 {
-                                        $filter = "(&(phpgwaccounttype=u)(uid=".$uid.")(!(phpgwaccountvisible=-1)))";
-                                        $justthese = array("uid","cn","dn");
+                                        $filter = "(&(phpgwaccounttype=u)(".$this->attribute."=".$uid.")(!(phpgwaccountvisible=-1)))";
+                                        $justthese = array($this->attribute,"cn","dn");
                                         $search = ldap_search( $this->conn, $this->contextLdap, $filter, $justthese);
                                         $get_entries = ldap_get_entries( $this->conn, $search);
@@ -245 +255 @@
                                 if( $this->conn )
                                 {
-                                        $filter                 = "(&(phpgwaccounttype=u)(uid=".$uid.")(!(phpgwaccountvisible=-1)))";
-                                        $justthese              = array("uid","jpegPhoto");
+                                        $filter                 = "(&(phpgwaccounttype=u)(".$this->attribute."=".$uid.")(!(phpgwaccountvisible=-1)))";
+                                        $justthese              = array($this->attribute,"jpegPhoto");
                                         $search                 = ldap_search($this->conn,$this->contextLdap,$filter,$justthese);
                                         $get_entries    = ldap_get_entries($this->conn,$search);
@@ -277 +287 @@
                         if( $this->conn )
                         {
-                                $filter                 = "(&(phpgwaccounttype=u)(uid=".$uid.")(!(phpgwaccountvisible=-1)))";
-                                $justthese              = array("uid","jpegPhoto");
+                                $filter                 = "(&(phpgwaccounttype=u)(".$this->attribute."=".$uid.")(!(phpgwaccountvisible=-1)))";
+                                $justthese              = array($this->attribute,"jpegPhoto");
                                 $search                 = ldap_search($this->conn,$this->contextLdap,$filter,$justthese);
                                 $get_entries    = ldap_get_entries($this->conn,$search);