Menu
▾
▴
[GeoNetwork-commit] SF.net SVN: geonetwork:[6702] branches/2.6.x/web/src/main
|
From: <jos...@us...> - 2010-10-28 22:44:27
|
Revision: 6702
http://geonetwork.svn.sourceforge.net/geonetwork/?rev=6702&view=rev
Author: josegar74
Date: 2010-10-28 22:44:20 +0000 (Thu, 28 Oct 2010)
Log Message:
-----------
#365: Allow to configure LDAP uid attribute name
Modified Paths:
--------------
branches/2.6.x/web/src/main/java/org/fao/geonet/services/config/Set.java
branches/2.6.x/web/src/main/java/org/fao/geonet/services/login/LDAPContext.java
branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql
branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-mckoi.sql
branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-mysql.sql
branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-oracle.sql
branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-postgis.sql
branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-postgres.sql
branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-sqlserver.sql
branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/default.sql
branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/mckoi.sql
branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/mysql.sql
branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/oracle.sql
branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/postgis.sql
branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/postgres.sql
branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/sqlserver.sql
branches/2.6.x/web/src/main/webapp/loc/ar/xml/config.xml
branches/2.6.x/web/src/main/webapp/loc/cn/xml/config.xml
branches/2.6.x/web/src/main/webapp/loc/de/xml/config.xml
branches/2.6.x/web/src/main/webapp/loc/en/xml/config.xml
branches/2.6.x/web/src/main/webapp/loc/es/xml/config.xml
branches/2.6.x/web/src/main/webapp/loc/fr/xml/config.xml
branches/2.6.x/web/src/main/webapp/loc/nl/xml/config.xml
branches/2.6.x/web/src/main/webapp/loc/pt/xml/config.xml
branches/2.6.x/web/src/main/webapp/loc/ru/xml/config.xml
branches/2.6.x/web/src/main/webapp/scripts/config/model.js
branches/2.6.x/web/src/main/webapp/scripts/config/view.js
branches/2.6.x/web/src/main/webapp/xsl/config/config.xsl
branches/2.6.x/web/src/main/webapp/xsl/xml/config.xsl
Modified: branches/2.6.x/web/src/main/java/org/fao/geonet/services/config/Set.java
===================================================================
--- branches/2.6.x/web/src/main/java/org/fao/geonet/services/config/Set.java 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/java/org/fao/geonet/services/config/Set.java 2010-10-28 22:44:20 UTC (rev 6702)
@@ -156,6 +156,7 @@
new ConfigEntry(ConfigEntry.Type.STRING, false, "ldap/host", "system/ldap/host"),
new ConfigEntry(ConfigEntry.Type.INT, false, "ldap/port", "system/ldap/port"),
new ConfigEntry(ConfigEntry.Type.STRING, true, "ldap/defaultProfile", "system/ldap/defaultProfile"),
+ new ConfigEntry(ConfigEntry.Type.STRING, true, "ldap/uidAttr", "system/ldap/uidAttr"),
new ConfigEntry(ConfigEntry.Type.STRING, true, "ldap/distinguishedNames/base", "system/ldap/distinguishedNames/base"),
new ConfigEntry(ConfigEntry.Type.STRING, true, "ldap/distinguishedNames/users","system/ldap/distinguishedNames/users"),
new ConfigEntry(ConfigEntry.Type.STRING, true, "ldap/userAttribs/name", "system/ldap/userAttribs/name"),
Modified: branches/2.6.x/web/src/main/java/org/fao/geonet/services/login/LDAPContext.java
===================================================================
--- branches/2.6.x/web/src/main/java/org/fao/geonet/services/login/LDAPContext.java 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/java/org/fao/geonet/services/login/LDAPContext.java 2010-10-28 22:44:20 UTC (rev 6702)
@@ -56,6 +56,7 @@
nameAttr = sm.getValue (prefix +"/userAttribs/name");
profileAttr = sm.getValue (prefix +"/userAttribs/profile");
emailAttr = "mail"; //TODO make it configurable
+ uidAttr = sm.getValue (prefix +"/uidAttr");
if (profileAttr.trim().length() == 0)
profileAttr = null;
@@ -81,7 +82,7 @@
{
try
{
- String uidFilter = "(uid=" + username + ")";
+ String uidFilter = "("+ uidAttr + "=" + username + ")";
String usersBaseDN = usersDN +","+ baseDN;
@@ -176,6 +177,7 @@
private String nameAttr;
private String profileAttr;
private String emailAttr;
+ private String uidAttr;
private HashSet<String> profiles = new HashSet<String>();
}
Modified: branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql
===================================================================
--- branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql 2010-10-28 22:44:20 UTC (rev 6702)
@@ -7264,6 +7264,7 @@
INSERT INTO Settings VALUES (82,80,'host',NULL);
INSERT INTO Settings VALUES (83,80,'port',NULL);
INSERT INTO Settings VALUES (84,80,'defaultProfile','RegisteredUser');
+INSERT INTO settings VALUES (85,80,'uidAttr','uid');
INSERT INTO Settings VALUES (86,80,'distinguishedNames',NULL);
INSERT INTO Settings VALUES (87,80,'userAttribs',NULL);
INSERT INTO Settings VALUES (90,1,'selectionmanager',NULL);
Modified: branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-mckoi.sql
===================================================================
--- branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-mckoi.sql 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-mckoi.sql 2010-10-28 22:44:20 UTC (rev 6702)
@@ -7264,6 +7264,7 @@
INSERT INTO Settings VALUES (82,80,'host',NULL);
INSERT INTO Settings VALUES (83,80,'port',NULL);
INSERT INTO Settings VALUES (84,80,'defaultProfile','RegisteredUser');
+INSERT INTO settings VALUES (85,80,'uidAttr','uid');
INSERT INTO Settings VALUES (86,80,'distinguishedNames',NULL);
INSERT INTO Settings VALUES (87,80,'userAttribs',NULL);
INSERT INTO Settings VALUES (90,1,'selectionmanager',NULL);
Modified: branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-mysql.sql
===================================================================
--- branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-mysql.sql 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-mysql.sql 2010-10-28 22:44:20 UTC (rev 6702)
@@ -7265,6 +7265,7 @@
INSERT INTO Settings VALUES (82,80,'host',NULL);
INSERT INTO Settings VALUES (83,80,'port',NULL);
INSERT INTO Settings VALUES (84,80,'defaultProfile','RegisteredUser');
+INSERT INTO settings VALUES (85,80,'uidAttr','uid');
INSERT INTO Settings VALUES (86,80,'distinguishedNames',NULL);
INSERT INTO Settings VALUES (87,80,'userAttribs',NULL);
INSERT INTO Settings VALUES (90,1,'selectionmanager',NULL);
Modified: branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-oracle.sql
===================================================================
--- branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-oracle.sql 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-oracle.sql 2010-10-28 22:44:20 UTC (rev 6702)
@@ -7265,6 +7265,7 @@
INSERT INTO Settings VALUES (82,80,'host',NULL);
INSERT INTO Settings VALUES (83,80,'port',NULL);
INSERT INTO Settings VALUES (84,80,'defaultProfile','RegisteredUser');
+INSERT INTO settings VALUES (85,80,'uidAttr','uid');
INSERT INTO Settings VALUES (86,80,'distinguishedNames',NULL);
INSERT INTO Settings VALUES (87,80,'userAttribs',NULL);
INSERT INTO Settings VALUES (90,1,'selectionmanager',NULL);
Modified: branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-postgis.sql
===================================================================
--- branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-postgis.sql 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-postgis.sql 2010-10-28 22:44:20 UTC (rev 6702)
@@ -7247,6 +7247,7 @@
INSERT INTO Settings VALUES (82,80,'host',NULL);
INSERT INTO Settings VALUES (83,80,'port',NULL);
INSERT INTO Settings VALUES (84,80,'defaultProfile','RegisteredUser');
+INSERT INTO settings VALUES (85,80,'uidAttr','uid');
INSERT INTO Settings VALUES (86,80,'distinguishedNames',NULL);
INSERT INTO Settings VALUES (87,80,'userAttribs',NULL);
INSERT INTO Settings VALUES (90,1,'selectionmanager',NULL);
Modified: branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-postgres.sql
===================================================================
--- branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-postgres.sql 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-postgres.sql 2010-10-28 22:44:20 UTC (rev 6702)
@@ -7247,6 +7247,7 @@
INSERT INTO Settings VALUES (82,80,'host',NULL);
INSERT INTO Settings VALUES (83,80,'port',NULL);
INSERT INTO Settings VALUES (84,80,'defaultProfile','RegisteredUser');
+INSERT INTO settings VALUES (85,80,'uidAttr','uid');
INSERT INTO Settings VALUES (86,80,'distinguishedNames',NULL);
INSERT INTO Settings VALUES (87,80,'userAttribs',NULL);
INSERT INTO Settings VALUES (90,1,'selectionmanager',NULL);
Modified: branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-sqlserver.sql
===================================================================
--- branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-sqlserver.sql 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-sqlserver.sql 2010-10-28 22:44:20 UTC (rev 6702)
@@ -7265,6 +7265,7 @@
INSERT INTO Settings VALUES (82,80,'host',NULL);
INSERT INTO Settings VALUES (83,80,'port',NULL);
INSERT INTO Settings VALUES (84,80,'defaultProfile','RegisteredUser');
+INSERT INTO settings VALUES (85,80,'uidAttr','uid');
INSERT INTO Settings VALUES (86,80,'distinguishedNames',NULL);
INSERT INTO Settings VALUES (87,80,'userAttribs',NULL);
INSERT INTO Settings VALUES (90,1,'selectionmanager',NULL);
Modified: branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/default.sql
===================================================================
--- branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/default.sql 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/default.sql 2010-10-28 22:44:20 UTC (rev 6702)
@@ -1,6 +1,7 @@
ALTER TABLE Settings MODIFY value longtext;
ALTER TABLE Metadata ADD displayorder int;
+INSERT INTO settings VALUES (85,80,'uidAttr','uid');
INSERT INTO Settings VALUES (90,1,'selectionmanager',NULL);
INSERT INTO Settings VALUES (91,90,'maxrecords','1000');
INSERT INTO Settings VALUES (210,1,'localrating',NULL);
Modified: branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/mckoi.sql
===================================================================
--- branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/mckoi.sql 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/mckoi.sql 2010-10-28 22:44:20 UTC (rev 6702)
@@ -8,6 +8,7 @@
ALTER TABLE Metadata ADD displayorder int;
+INSERT INTO settings VALUES (85,80,'uidAttr','uid');
INSERT INTO Settings VALUES (90,1,'selectionmanager',NULL);
INSERT INTO Settings VALUES (91,90,'maxrecords','1000');
INSERT INTO Settings VALUES (210,1,'localrating',NULL);
Modified: branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/mysql.sql
===================================================================
--- branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/mysql.sql 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/mysql.sql 2010-10-28 22:44:20 UTC (rev 6702)
@@ -1,6 +1,7 @@
ALTER TABLE Settings MODIFY value longtext;
ALTER TABLE Metadata ADD displayorder int;
+INSERT INTO settings VALUES (85,80,'uidAttr','uid');
INSERT INTO Settings VALUES (90,1,'selectionmanager',NULL);
INSERT INTO Settings VALUES (91,90,'maxrecords','1000');
INSERT INTO Settings VALUES (210,1,'localrating',NULL);
Modified: branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/oracle.sql
===================================================================
--- branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/oracle.sql 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/oracle.sql 2010-10-28 22:44:20 UTC (rev 6702)
@@ -1,6 +1,7 @@
ALTER TABLE Settings MODIFY value long;
ALTER TABLE Metadata ADD displayorder int;
+INSERT INTO settings VALUES (85,80,'uidAttr','uid');
INSERT INTO Settings VALUES (90,1,'selectionmanager',NULL);
INSERT INTO Settings VALUES (91,90,'maxrecords','1000');
INSERT INTO Settings VALUES (210,1,'localrating',NULL);
Modified: branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/postgis.sql
===================================================================
--- branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/postgis.sql 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/postgis.sql 2010-10-28 22:44:20 UTC (rev 6702)
@@ -1,6 +1,7 @@
ALTER TABLE Settings ALTER COLUMN value TYPE text;
ALTER TABLE Metadata ADD displayorder int;
+INSERT INTO settings VALUES (85,80,'uidAttr','uid');
INSERT INTO Settings VALUES (90,1,'selectionmanager',NULL);
INSERT INTO Settings VALUES (91,90,'maxrecords','1000');
INSERT INTO Settings VALUES (210,1,'localrating',NULL);
Modified: branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/postgres.sql
===================================================================
--- branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/postgres.sql 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/postgres.sql 2010-10-28 22:44:20 UTC (rev 6702)
@@ -1,6 +1,7 @@
ALTER TABLE Settings ALTER COLUMN value TYPE text;
ALTER TABLE Metadata ADD displayorder int;
+INSERT INTO settings VALUES (85,80,'uidAttr','uid');
INSERT INTO Settings VALUES (90,1,'selectionmanager',NULL);
INSERT INTO Settings VALUES (91,90,'maxrecords','1000');
INSERT INTO Settings VALUES (210,1,'localrating',NULL);
Modified: branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/sqlserver.sql
===================================================================
--- branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/sqlserver.sql 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/2.4.3-to-2.6.0/sqlserver.sql 2010-10-28 22:44:20 UTC (rev 6702)
@@ -1,6 +1,7 @@
ALTER TABLE Settings ALTER COLUMN value TYPE text;
ALTER TABLE Metadata ADD displayorder int;
+INSERT INTO settings VALUES (85,80,'uidAttr','uid');
INSERT INTO Settings VALUES (90,1,'selectionmanager',NULL);
INSERT INTO Settings VALUES (91,90,'maxrecords','1000');
INSERT INTO Settings VALUES (210,1,'localrating',NULL);
Modified: branches/2.6.x/web/src/main/webapp/loc/ar/xml/config.xml
===================================================================
--- branches/2.6.x/web/src/main/webapp/loc/ar/xml/config.xml 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/loc/ar/xml/config.xml 2010-10-28 22:44:20 UTC (rev 6702)
@@ -120,6 +120,7 @@
<ldap>LDAP Authentication</ldap>
<defProfile>Default profile</defProfile>
+ <uidAttr>Uid attribute</uidAttr>
<login>Login</login>
<userDN>User DN</userDN>
<distNames>Distinguished names</distNames>
Modified: branches/2.6.x/web/src/main/webapp/loc/cn/xml/config.xml
===================================================================
--- branches/2.6.x/web/src/main/webapp/loc/cn/xml/config.xml 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/loc/cn/xml/config.xml 2010-10-28 22:44:20 UTC (rev 6702)
@@ -120,6 +120,7 @@
<ldap>LDAP</ldap>
<defProfile>Default profile</defProfile>
+ <uidAttr>Uid attribute</uidAttr>
<login>Login</login>
<userDN>User DN</userDN>
<distNames>Distinguished names</distNames>
Modified: branches/2.6.x/web/src/main/webapp/loc/de/xml/config.xml
===================================================================
--- branches/2.6.x/web/src/main/webapp/loc/de/xml/config.xml 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/loc/de/xml/config.xml 2010-10-28 22:44:20 UTC (rev 6702)
@@ -120,6 +120,7 @@
<ldap>LDAP Authentifizierung</ldap>
<defProfile>Voreingestelltes Profil</defProfile>
+ <uidAttr>Uid attribute</uidAttr>
<login>Login</login>
<userDN>User DN</userDN>
<distNames>Distinguished names</distNames>
Modified: branches/2.6.x/web/src/main/webapp/loc/en/xml/config.xml
===================================================================
--- branches/2.6.x/web/src/main/webapp/loc/en/xml/config.xml 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/loc/en/xml/config.xml 2010-10-28 22:44:20 UTC (rev 6702)
@@ -120,6 +120,7 @@
<ldap>LDAP</ldap>
<defProfile>Default profile</defProfile>
+ <uidAttr>Uid attribute</uidAttr>
<login>Login</login>
<userDN>User DN</userDN>
<distNames>Distinguished names</distNames>
Modified: branches/2.6.x/web/src/main/webapp/loc/es/xml/config.xml
===================================================================
--- branches/2.6.x/web/src/main/webapp/loc/es/xml/config.xml 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/loc/es/xml/config.xml 2010-10-28 22:44:20 UTC (rev 6702)
@@ -121,6 +121,7 @@
<ldap>LDAP Autenticación</ldap>
<defProfile>Default profile</defProfile>
+ <uidAttr>Uid attribute</uidAttr>
<login>Login</login>
<userDN>User DN</userDN>
<distNames>Distinguished names</distNames>
Modified: branches/2.6.x/web/src/main/webapp/loc/fr/xml/config.xml
===================================================================
--- branches/2.6.x/web/src/main/webapp/loc/fr/xml/config.xml 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/loc/fr/xml/config.xml 2010-10-28 22:44:20 UTC (rev 6702)
@@ -6,6 +6,7 @@
<dir>Répertoire</dir>
<ldap>Authentification LDAP</ldap>
<defProfile>Profil par défaut</defProfile>
+ <uidAttr>Uid attribute</uidAttr>
<login>Nom d'utilisateur</login>
<userDN>User DN</userDN>
<distNames>Distinguished names</distNames>
Modified: branches/2.6.x/web/src/main/webapp/loc/nl/xml/config.xml
===================================================================
--- branches/2.6.x/web/src/main/webapp/loc/nl/xml/config.xml 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/loc/nl/xml/config.xml 2010-10-28 22:44:20 UTC (rev 6702)
@@ -120,6 +120,7 @@
<ldap>LDAP Authenticatie</ldap>
<defProfile>Standaard profiel</defProfile>
+ <uidAttr>Uid attribute</uidAttr>
<login>Login</login>
<userDN>Gebruiker DN</userDN>
<distNames>Gedist. Namen</distNames>
Modified: branches/2.6.x/web/src/main/webapp/loc/pt/xml/config.xml
===================================================================
--- branches/2.6.x/web/src/main/webapp/loc/pt/xml/config.xml 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/loc/pt/xml/config.xml 2010-10-28 22:44:20 UTC (rev 6702)
@@ -120,6 +120,7 @@
<ldap>Autenticação LDAP</ldap>
<defProfile>Perfil pré-definido</defProfile>
+ <uidAttr>Uid attribute</uidAttr>
<login>Iniciar sessão</login>
<userDN>DN de utilizador</userDN>
<distNames>Nomes distintos</distNames>
Modified: branches/2.6.x/web/src/main/webapp/loc/ru/xml/config.xml
===================================================================
--- branches/2.6.x/web/src/main/webapp/loc/ru/xml/config.xml 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/loc/ru/xml/config.xml 2010-10-28 22:44:20 UTC (rev 6702)
@@ -119,6 +119,7 @@
<ldap>Аутентификация LDAP</ldap>
<defProfile>Профиль по умолчанию</defProfile>
+ <uidAttr>Uid attribute</uidAttr>
<login>Логин</login>
<userDN>Пользовательский DN</userDN>
<distNames>Distinguished names</distNames>
Modified: branches/2.6.x/web/src/main/webapp/scripts/config/model.js
===================================================================
--- branches/2.6.x/web/src/main/webapp/scripts/config/model.js 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/scripts/config/model.js 2010-10-28 22:44:20 UTC (rev 6702)
@@ -95,6 +95,7 @@
LDAP_HOST : xml.evalXPath(node, 'ldap/host'),
LDAP_PORT : xml.evalXPath(node, 'ldap/port'),
LDAP_DEF_PROFILE : xml.evalXPath(node, 'ldap/defaultProfile'),
+ LDAP_ATTR_UID : xml.evalXPath(node, 'ldap/uidAttr'),
LDAP_DN_BASE : xml.evalXPath(node, 'ldap/distinguishedNames/base'),
LDAP_DN_USERS : xml.evalXPath(node, 'ldap/distinguishedNames/users'),
LDAP_ATTR_NAME : xml.evalXPath(node, 'ldap/userAttribs/name'),
@@ -248,6 +249,7 @@
' <host>{LDAP_HOST}</host>'+
' <port>{LDAP_PORT}</port>'+
' <defaultProfile>{LDAP_DEF_PROFILE}</defaultProfile>'+
+' <uidAttr>{LDAP_ATTR_UID}</uidAttr>'+
' <distinguishedNames>'+
' <base>{LDAP_DN_BASE}</base>'+
' <users>{LDAP_DN_USERS}</users>'+
Modified: branches/2.6.x/web/src/main/webapp/scripts/config/view.js
===================================================================
--- branches/2.6.x/web/src/main/webapp/scripts/config/view.js 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/scripts/config/view.js 2010-10-28 22:44:20 UTC (rev 6702)
@@ -56,7 +56,8 @@
{ id:'ldap.baseDN', type:'length', minSize :1, maxSize :200 },
{ id:'ldap.usersDN', type:'length', minSize :1, maxSize :200 },
{ id:'ldap.nameAttr', type:'length', minSize :1, maxSize :200 },
-
+ { id:'ldap.uidAttr', type:'length', minSize :1, maxSize :20 },
+
{ id:'shib.path', type:'length', minSize :0, maxSize :256 },
{ id:'shib.attrib.username', type:'length', minSize :0, maxSize :150 },
{ id:'shib.attrib.surname', type:'length', minSize :0, maxSize :150 },
@@ -166,6 +167,7 @@
$('ldap.host') .value = data['LDAP_HOST'];
$('ldap.port') .value = data['LDAP_PORT'];
$('ldap.defProfile') .value = data['LDAP_DEF_PROFILE'];
+ $('ldap.uidAttr') .value = data['LDAP_ATTR_UID'];
$('ldap.baseDN') .value = data['LDAP_DN_BASE'];
$('ldap.usersDN') .value = data['LDAP_DN_USERS'];
$('ldap.nameAttr') .value = data['LDAP_ATTR_NAME'];
@@ -277,6 +279,7 @@
LDAP_HOST : $F('ldap.host'),
LDAP_PORT : $F('ldap.port'),
LDAP_DEF_PROFILE : $F('ldap.defProfile'),
+ LDAP_ATTR_UID : $F('ldap.uidAttr'),
LDAP_DN_BASE : $F('ldap.baseDN'),
LDAP_DN_USERS : $F('ldap.usersDN'),
LDAP_ATTR_NAME : $F('ldap.nameAttr'),
Modified: branches/2.6.x/web/src/main/webapp/xsl/config/config.xsl
===================================================================
--- branches/2.6.x/web/src/main/webapp/xsl/config/config.xsl 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/xsl/config/config.xsl 2010-10-28 22:44:20 UTC (rev 6702)
@@ -594,6 +594,11 @@
<td class="padded"><xsl:value-of select="/root/gui/config/defProfile"/></td>
<td class="padded"><xsl:call-template name="ldapDefProfile"/></td>
</tr>
+
+ <tr>
+ <td class="padded"><xsl:value-of select="/root/gui/config/uidAttr"/></td>
+ <td class="padded"><input id="ldap.uidAttr" class="content" type="text" value="" size="20"/></td>
+ </tr>
<!-- distinguished names -->
Modified: branches/2.6.x/web/src/main/webapp/xsl/xml/config.xsl
===================================================================
--- branches/2.6.x/web/src/main/webapp/xsl/xml/config.xsl 2010-10-28 20:59:59 UTC (rev 6701)
+++ branches/2.6.x/web/src/main/webapp/xsl/xml/config.xsl 2010-10-28 22:44:20 UTC (rev 6702)
@@ -160,7 +160,8 @@
<use><xsl:value-of select="$ldap/use/value"/></use>
<host><xsl:value-of select="$ldap/host/value"/></host>
<port><xsl:value-of select="$ldap/port/value"/></port>
- <defaultProfile><xsl:value-of select="$ldap/defaultProfile/value"/></defaultProfile>
+ <defaultProfile><xsl:value-of select="$ldap/defaultProfile/value"/></defaultProfile>
+ <uidAttr><xsl:value-of select="$ldap/uidAttr/value"/></uidAttr>
<distinguishedNames>
<base><xsl:value-of select="$ldapDisNam/base/value"/></base>
<users><xsl:value-of select="$ldapDisNam/users/value"/></users>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|