From 35f20d52489ad014eef4ca84a4fa163a0e7004b3 Mon Sep 17 00:00:00 2001
From: Ignacio Diaz Teijido <ignacio.diaz@comtecsf.es>
Date: Tue, 28 Jun 2011 17:13:17 +0200
Subject: [PATCH] Changed [@user_id] by [USER_ID] in replacement for search
 query

FEA: ItEr74S09LdapAuhentication
---
 .../web/users/services/LDAPCustomAuthenticationProvider.java  | 4 +++-
 navalplanner-webapp/src/main/webapp/common/configuration.zul  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/services/LDAPCustomAuthenticationProvider.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/services/LDAPCustomAuthenticationProvider.java
index b3ee87f1c..92d28fc38 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/services/LDAPCustomAuthenticationProvider.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/services/LDAPCustomAuthenticationProvider.java
@@ -92,6 +92,8 @@ public class LDAPCustomAuthenticationProvider extends
 
     private static final String COLON = ":";
 
+    private static final String USER_ID_SUBSTITUTION = "[USER_ID]";
+
     @Override
     protected void additionalAuthenticationChecks(UserDetails arg0,
             UsernamePasswordAuthenticationToken arg1)
@@ -303,7 +305,7 @@ public class LDAPCustomAuthenticationProvider extends
             LdapTemplate ldapTemplate, String username) {
 
         String queryRoles = configuration.getLdapSearchQuery().replace(
-                "[@user_id]", username);
+                USER_ID_SUBSTITUTION, username);
 
         final LDAPConfiguration ldapConfig = configuration;
         String groupsPath = configuration.getLdapGroupPath();
diff --git a/navalplanner-webapp/src/main/webapp/common/configuration.zul b/navalplanner-webapp/src/main/webapp/common/configuration.zul
index 1bde36b31..316d31fdb 100644
--- a/navalplanner-webapp/src/main/webapp/common/configuration.zul
+++ b/navalplanner-webapp/src/main/webapp/common/configuration.zul
@@ -365,7 +365,7 @@
                                     <label value="${i18n:_('Role search query:')}" />
                                     <hbox>
                                         <textbox id="ldapSearchQuery" value="@{configurationController.ldapConfiguration.ldapSearchQuery}"  width="300px"/>
-                                        <label value="${i18n:__('Example: {0}', 'uid=[@user_id],ou=groups,ou=people,dc=example,dc=org')}" />
+                                        <label value="${i18n:__('Example: {0}', 'uid=[USER_ID],ou=groups,ou=people,dc=example,dc=org')}" />
                                     </hbox>
                                 </row>
                             </rows>