wilde: server/kolab-webclient ChangeLog, 1.10.2.9, 1.10.2.10 kolab-webclient.spec, 1.23.2.13, 1.23.2.14 webclient-kolab-conf.template, 1.2.2.1, 1.2.2.2

[cvs at kolab.org]

Author: wilde

Update of /kolabrepository/server/kolab-webclient
In directory doto:/tmp/cvs-serv13310/kolab-webclient

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog kolab-webclient.spec webclient-kolab-conf.template 
Log Message:
Added ability to map arbitrary ldap attributes to those expected by kolab.
(Merged from suc branch)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.10.2.9
retrieving revision 1.10.2.10
diff -u -d -r1.10.2.9 -r1.10.2.10
--- ChangeLog	12 Oct 2009 14:09:00 -0000	1.10.2.9
+++ ChangeLog	13 Oct 2009 12:37:27 -0000	1.10.2.10
@@ -29,6 +29,17 @@
 	kolab/issue3420 (web client prefs and hooks should be configurable
 	                 via templates)
 
+2009-04-24  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab-webclient.spec: Additional fixes for configurable mapping
+	of LDAP attributes.
+
+2009-04-23  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab-webclient.spec: Support for configurable mapping of LDAP
+	attributes.
+
+
 2009-04-02  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab-webclient.spec:
@@ -44,7 +55,7 @@
 
 2008-02-07  Mathieu Parent <math.parent at gmail.com>
 
-	* webclient-kolab-conf.template, webclient-kronolith-kolab-conf.template: 
+	* webclient-kolab-conf.template, webclient-kronolith-kolab-conf.template:
 	dist_conf configuration in kolab webclient templates (kolab/issue3387)
 
 2009-01-08  Gunnar Wrobel  <p at rdus.de>

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.23.2.13
retrieving revision 1.23.2.14
diff -u -d -r1.23.2.13 -r1.23.2.14
--- kolab-webclient.spec	12 Oct 2009 16:34:37 -0000	1.23.2.13
+++ kolab-webclient.spec	13 Oct 2009 12:37:27 -0000	1.23.2.14
@@ -3,7 +3,7 @@
 %define         V_package kolab-webclient
 %define         V_year  2009
 %define         V_month 10
-%define         V_day   12
+%define         V_day   13
 %define         V_version 1.2.0
 %define         V_source_version 1.2
 %define         V_passwd_version 3.0.1

Index: webclient-kolab-conf.template
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/webclient-kolab-conf.template,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- webclient-kolab-conf.template	9 Oct 2009 16:11:51 -0000	1.2.2.1
+++ webclient-kolab-conf.template	13 Oct 2009 12:37:27 -0000	1.2.2.2
@@ -19,6 +19,24 @@
 @@@endif@@@
 $conf['kolab']['imap']['maildomain'] = '@@@postfix-mydomain@@@';
 
+/**
+ * If you use customized LDAP attributes on your LDAP server the
+ * following configuration setting allows you to map the standard
+ * Kolab attribute names to your customizations.
+ *
+ * Specify the mapping line by line:
+ *
+ * $conf['kolab']['ldap']['map']['uid'] = 'uid2';
+ * $conf['kolab']['ldap']['map']['mobile'] = 'handy';
+ *
+ * or use a hash structure:
+ *
+ * $conf['kolab']['ldap']['map'] = array('uid' => 'uid2',
+ *                                       'mobile' => 'handy');
+ *
+ */
+//$conf['kolab']['ldap']['map']['uid'] = 'uid2';
+
 /* Credentials for a proxy user to allow quasi anonymous ICS access
  * via /public-cal/ics. You will need to create this user first.
  */