steffen: server/kolab/kolab/templates fbview.conf.template, 1.2, 1.3 freebusy.conf.template, 1.4, 1.5

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab/kolab/templates
In directory doto:/tmp/cvs-serv15905/kolab/kolab/templates

Modified Files:
	fbview.conf.template freebusy.conf.template 
Log Message:
ldap uri for php, html fbview works again

Index: fbview.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/fbview.conf.template,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fbview.conf.template	15 Jun 2004 08:00:13 -0000	1.2
+++ fbview.conf.template	1 Jul 2004 02:20:56 -0000	1.3
@@ -1,16 +1,16 @@
 <?php
 
 // What is the address of the Cyrus server where the calendar data is stored?
-$params['server'] = 'localhost';
+$params['server'] = '@@@fqhostname@@@';
 
 // What is the Base DN of our LDAP database?
 $params['base_dn'] = '@@@base_dn@@@';
 
 // What DN should we use to bind to the LDAP server?
-$params['bind_dn'] = '@@@bind_dn@@@';
+$params['bind_dn'] = '@@@php_dn@@@';
 
 // What password should we use with the above DN when binding?
-$params['bind_pw'] = '@@@bind_pw@@@';
+$params['bind_pw'] = '@@@php_pw@@@';
 
 // What is our default mail domain? This is used if any users do not have
 // '@domain' specified after their username as part of their email address.
@@ -32,4 +32,4 @@
 $params['calendar_store'] = 'Calendar';
 
 // Where can we get free/busy information from?
-$params['freebusy_url'] = 'http://localhost/freebusy/${USER}.vfb?x=';
+$params['freebusy_url'] = 'https://'.urlencode($params['calendar_user']).':'.urlencode($params['calendar_pass']).'@'.'@@@fqhostname@@@/freebusy/${USER}.xfb';

Index: freebusy.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/freebusy.conf.template,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- freebusy.conf.template	30 Jun 2004 10:42:50 -0000	1.4
+++ freebusy.conf.template	1 Jul 2004 02:20:56 -0000	1.5
@@ -3,9 +3,11 @@
 // Kolab prefix
 $params['kolab_prefix'] = '@l_prefix@';
 
-// What is the address of the Cyrus server where the calendar data is stored?
-// This is also used as the LDAP server address where user objects reside
+// The name of _this_ server
 $params['server'] = '@@@fqhostname@@@';
+
+// What is the address of the LDAP server address where user objects reside
+$params['ldap_uri'] = '@@@ldap_uri@@@';
 
 // What is the Base DN of our LDAP database?
 $params['base_dn'] = '@@@base_dn@@@';