add caldav and carddav files in their old place for backward compatibility - add rewriterule for caldav and carddav

This commit is contained in:
Georg Ehrke 2012-05-16 21:05:15 +02:00
parent b39f01fce6
commit 9e83c3f823
5 changed files with 23 additions and 1 deletions

View File

@ -13,7 +13,9 @@ RewriteEngine on
RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}] RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
RewriteRule ^.well-known/host-meta /public.php?service=host-meta [QSA,L] RewriteRule ^.well-known/host-meta /public.php?service=host-meta [QSA,L]
RewriteRule ^.well-known/carddav /remote.php/carddav/ [R] RewriteRule ^.well-known/carddav /remote.php/carddav/ [R]
RewriteRule ^.well-known/caldav /remote.php/caldav/ [R] RewriteRule ^.well-known/caldav /remote.php/caldav/ [R]
RewriteRule ^apps/calendar/caldav.php remote.php/caldav/ [QSA,L]
RewriteRule ^apps/contacts/carddav.php remote.php/carddav/ [QSA,L]
RewriteRule ^apps/([^/]*)/(.*\.(css|php))$ index.php?app=$1&getfile=$2 [QSA,L] RewriteRule ^apps/([^/]*)/(.*\.(css|php))$ index.php?app=$1&getfile=$2 [QSA,L]
RewriteRule ^remote/(.*) remote.php [QSA,L] RewriteRule ^remote/(.*) remote.php [QSA,L]
</IfModule> </IfModule>

View File

@ -7,6 +7,10 @@
*/ */
OCP\App::checkAppEnabled('calendar'); OCP\App::checkAppEnabled('calendar');
if(substr($_SERVER["REQUEST_URI"],0,strlen(OC::$APPSWEBROOT . '/apps/calendar/caldav.php')) == OC::$APPSWEBROOT . '/apps/calendar/caldav.php'){
$baseuri = OC::$APPSWEBROOT . '/apps/calendar/caldav.php';
}
// only need authentication apps // only need authentication apps
$RUNTIME_APPTYPES=array('authentication'); $RUNTIME_APPTYPES=array('authentication');
OC_App::loadApps($RUNTIME_APPTYPES); OC_App::loadApps($RUNTIME_APPTYPES);

6
apps/calendar/caldav.php Normal file
View File

@ -0,0 +1,6 @@
<?php
if(!file_exists('../../lib/base.php')){
die('Please update the path to /lib/base.php in caldav.php or make use of /remote.php/caldav/');
}
require_once('../../lib/base.php');
require_once('appinfo/remote.php');

View File

@ -22,6 +22,10 @@
OCP\App::checkAppEnabled('contacts'); OCP\App::checkAppEnabled('contacts');
if(substr($_SERVER["REQUEST_URI"],0,strlen(OC::$APPSWEBROOT . '/apps/contacts/carddav.php')) == OC::$APPSWEBROOT . '/apps/contacts/carddav.php'){
$baseuri = OC::$APPSWEBROOT . '/apps/contacts/carddav.php';
}
// only need authentication apps // only need authentication apps
$RUNTIME_APPTYPES=array('authentication'); $RUNTIME_APPTYPES=array('authentication');
OC_App::loadApps($RUNTIME_APPTYPES); OC_App::loadApps($RUNTIME_APPTYPES);

View File

@ -0,0 +1,6 @@
<?php
if(!file_exists('../../lib/base.php')){
die('Please update the path to /lib/base.php in carddav.php or make use of /remote.php/carddav/');
}
require_once('../../lib/base.php');
require_once('appinfo/remote.php');