thomas: server/kolabd/kolabd/templates httpd.conf.template.in, 1.25, 1.26 resmgr.conf.template.in, 1.23, 1.24

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv3407/kolabd/kolabd/templates

Modified Files:
	httpd.conf.template.in resmgr.conf.template.in 
Log Message:
Rename .xpfb to .pxfb. Triggering .pfb generates partial extended fb, too.

As per discussion with Bernhard Reiter:
The free/busy specs were inconsistent in the use of xpfb vs. pxfb, so
we consistently use pxfb now.


Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- httpd.conf.template.in	7 Mar 2008 16:49:25 -0000	1.25
+++ httpd.conf.template.in	2 Apr 2008 17:32:55 -0000	1.26
@@ -36,8 +36,7 @@
 RewriteRule ^/freebusy/([^/]+)\.xfb %{DOCUMENT_ROOT}/freebusy/freebusy.php?uid=$1&extended=1
 RewriteRule ^/freebusy/trigger/(.+)\.pfb %{DOCUMENT_ROOT}/freebusy/pfb.php?folder=$1&cache=0
 RewriteRule ^/freebusy/(.+)\.pfb %{DOCUMENT_ROOT}/freebusy/pfb.php?folder=$1&cache=1
-RewriteRule ^/freebusy/trigger/(.+)\.xpfb %{DOCUMENT_ROOT}/freebusy/pfb.php?folder=$1&cache=0&extended=1
-RewriteRule ^/freebusy/(.+)\.xpfb %{DOCUMENT_ROOT}/freebusy/pfb.php?folder=$1&cache=1&extended=1
+RewriteRule ^/freebusy/(.+)\.pxfb %{DOCUMENT_ROOT}/freebusy/pfb.php?folder=$1&cache=1&extended=1
 
 <VirtualHost _default_:443>
 SSLEngine               on

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- resmgr.conf.template.in	13 Mar 2008 16:56:48 -0000	1.23
+++ resmgr.conf.template.in	2 Apr 2008 17:32:55 -0000	1.24
@@ -151,7 +151,7 @@
 $conf['filter']['freebusy_url'] = 'https://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/${USER}.xfb';
  
 /* PFB url to trigger creation of pfb */
-$conf['filter']['pfb_trigger_url'] = 'https://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/trigger/${USER}/${FOLDER}.xpfb';
+$conf['filter']['pfb_trigger_url'] = 'https://@@@fqdnhostname@@@@webserver_web_prefix@/freebusy/trigger/${USER}/${FOLDER}.pfb';
 
 /* Temporary data storage for the scripts */
 $conf['filter']['tempdir'] = '@resmgr_tmpdir@';