thomas: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.conf.in, 1.3, 1.4

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv21057/kolab-resource-handlers/kolab-resource-handlers/resmgr

Modified Files:
	resmgr.conf.in 
Log Message:
Added parameters for kolab/issue974 (from rewriting text) to config,
porting changes done to one or the other config in this process.


Index: resmgr.conf.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.conf.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- resmgr.conf.in	21 Dec 2006 10:59:22 -0000	1.3
+++ resmgr.conf.in	26 Apr 2007 16:22:23 -0000	1.4
@@ -38,6 +38,7 @@
 
 // Text to be inserted in From: when rewriting untrusted mails
 $params['untrusted_subject_insert']="(UNTRUSTED, sender is <%s>)";
+$params['unauthenticated_subject_insert'] = "(UNTRUSTED, sender <%s> is not authenticated)";
 
 // Should we allow forwarded ical messages from Outlook
 // by encapsulating them in a MIME multipart
@@ -66,10 +67,12 @@
 $params['priv_key_file'] = '@sysconfdir@/kolab/res_priv.pem';
 
 // What is the name of the users' calendar mailbox?
+// This is only used when the user does not already have
+// a primary calendar folder (search via Kolab annotation)
 $params['calendar_store'] = 'Calendar';
 
 // Where can we get free/busy information from?
-$params['freebusy_url'] = 'http://kolab.example.com/freebusy/${USER}.ifb';
+$params['freebusy_url'] = 'http://kolab.example.com/freebusy/${USER}.xfb';
  
 // PFB url to trigger creation of pfb
 $params['pfb_trigger_url'] = 'http://@@@fqdnhostname@@@/freebusy/trigger/${USER}/${FOLDER}.xpfb';