Changeset 8179

Timestamp:

06/28/13 12:23:38 (10 years ago)

Author:

douglas

Message:

Ticket #3463 - Organizacao LDAP sendo carregada de maneira inconsistente

Location:

branches/2.5/expressoAdmin1_2

Files:

• inc/class.ldap_functions.inc.php (modified) (1 diff)
• js/jscode/shared_accounts.js (modified) (2 diffs)

branches/2.5/expressoAdmin1_2/inc/class.ldap_functions.inc.php

@@ -394 +394 @@
                 // Se for encontrado somente um objeto e este estiver diferente do ANCHOR, entao pega o DN 
                 // do resultado da busca
-                if ( ($entries['count'] == 1) && (utf8_decode($entries[0]['dn']) != $anchor) )
+                if ( ($entries['count'] == 1) && (strtolower(utf8_decode($entries[0]['dn'])) != $anchor) )
                 {
                         // Forca o DN

branches/2.5/expressoAdmin1_2/js/jscode/shared_accounts.js

@@ -97 +97 @@
 {
     combo_org_available_users = Element('ea_combo_org_available_users');
-
+    context = context.toLowerCase(); 
     for (i=0; i<combo_org_available_users.length; i++)
     {
-        if (combo_org_available_users.options[i].value == context)
+        if (combo_org_available_users.options[i].value.toLowerCase() == context)
         {
             combo_org_available_users.options[i].selected = true;
@@ -300 +300 @@
 
             var combo_org = Element('ea_combo_org');
+            var context_to_select = data.user_context.toLowerCase(); 
             for (i=0; i<combo_org.length; i++)
             {
-                if (combo_org.options[i].value == data.user_context)
+                if (combo_org.options[i].value.toLowerCase() == context_to_select)
                 {
                     combo_org.options[i].selected = true;