diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-05-16 21:05:15 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-05-16 21:05:15 +0200 |
| commit | 9e83c3f823a545ea91b584d3d7c8a81ebf8c2fb4 (patch) | |
| tree | a4b91e7de1770e9d71bae60755eadda8e1742626 | |
| parent | b39f01fce6756a5c9a181de4e7387e10ad556428 (diff) | |
| download | nextcloud-server-9e83c3f823a545ea91b584d3d7c8a81ebf8c2fb4.tar.gz nextcloud-server-9e83c3f823a545ea91b584d3d7c8a81ebf8c2fb4.zip | |
add caldav and carddav files in their old place for backward compatibility - add rewriterule for caldav and carddav
| -rw-r--r-- | .htaccess | 4 | ||||
| -rw-r--r-- | apps/calendar/appinfo/remote.php | 4 | ||||
| -rw-r--r-- | apps/calendar/caldav.php | 6 | ||||
| -rw-r--r-- | apps/contacts/appinfo/remote.php | 4 | ||||
| -rw-r--r-- | apps/contacts/carddav.php | 6 |
5 files changed, 23 insertions, 1 deletions
diff --git a/.htaccess b/.htaccess index 79904f8a9da..095a0cc6375 100644 --- a/.htaccess +++ b/.htaccess @@ -13,7 +13,9 @@ RewriteEngine on RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}] RewriteRule ^.well-known/host-meta /public.php?service=host-meta [QSA,L] 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 ^remote/(.*) remote.php [QSA,L] </IfModule> diff --git a/apps/calendar/appinfo/remote.php b/apps/calendar/appinfo/remote.php index 0673c36540f..3bd8737ee97 100644 --- a/apps/calendar/appinfo/remote.php +++ b/apps/calendar/appinfo/remote.php @@ -7,6 +7,10 @@ */ 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 $RUNTIME_APPTYPES=array('authentication'); OC_App::loadApps($RUNTIME_APPTYPES); diff --git a/apps/calendar/caldav.php b/apps/calendar/caldav.php new file mode 100644 index 00000000000..7b811d3cdf1 --- /dev/null +++ b/apps/calendar/caldav.php @@ -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');
\ No newline at end of file diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php index 9a34ecd4a4c..ef50e4ad39f 100644 --- a/apps/contacts/appinfo/remote.php +++ b/apps/contacts/appinfo/remote.php @@ -22,6 +22,10 @@ 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 $RUNTIME_APPTYPES=array('authentication'); OC_App::loadApps($RUNTIME_APPTYPES); diff --git a/apps/contacts/carddav.php b/apps/contacts/carddav.php new file mode 100644 index 00000000000..e0579e625d7 --- /dev/null +++ b/apps/contacts/carddav.php @@ -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');
\ No newline at end of file |