Changeset 1900 for trunk/jabberit_messenger/inc/login.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/login.php (modified) (1 diff)

trunk/jabberit_messenger/inc/login.php

@@ -36 +36 @@
                         $PROTOCOL = trim("https");
 
+                // Define Attribute Ldap
+                $attribute = "uid";
+                if ( file_exists('inc/attributeLdap.php') )
+                {
+                        require_once('attributeLdap.php');
+                        $attribute = trim($attributeTypeName);
+                }
+
                 // Uid user
-                $uid = $_SESSION['phpgw_info']['jabberit_messenger']['user_jabber'];
-                
-                $organization = explode(",", $_SESSION['phpgw_info']['jabberit_messenger']['attributes_org_ldap_jabberit']);
-
-                $organization_user = $_SESSION['phpgw_info']['jabberit_messenger']['account_dn'];
-                $organization_user = substr($organization_user, strpos($organization_user,"ou=") + 3 , strlen($organization_user));
-                $organization_user = substr($organization_user, 0, strpos($organization_user, ","));
+                if( $attribute === "uid" )
+                {
+                        $uid = $_SESSION['phpgw_info']['jabberit_messenger']['user_jabber'];
+                }
+                else
+                {
+                        $uid = "DEFINA AQUI A VARIAVEL DE SESSÃO QUE CONTEM O ATRIBUTO DE AUTENTICAÇÂO";
+                }
                 
                 // FirstName
                 $CnName = explode(" ",$_SESSION['phpgw_info']['jabberit_messenger']['fullname']);
                 
-                if(is_array($organization))
-                {
-                        foreach($organization as $attr)
-                        {
-                                $tmp = explode(";",$attr);
-                                if( strtolower(trim($tmp[0])) == strtolower(trim($organization_user)))
-                                {
-                                        switch(strtolower(trim($tmp[1])))
-                                        {
-                                                case "mail" :
-                                                                $uid = $_SESSION['phpgw_info']['jabberit_messenger']['mail'];
-                                                                $uid = substr($uid,0,strpos($uid,"@")); 
-                                                                break;
-        
-                                                case "description" :
-                                                                // SERPRO
-                                                                // parte antes do arroba;
-                                                                // Informe aqui a parte da sessão correspondente; 
-                                                                $uid = "description";                                                                           
-                                                                break;
-                                        }
-                                }
-                        }
-                }
-
                 //Enable/Disable VoIP Service -> Voip Server Config
                 $voip_enabled = false;