From da03d057007d885914dfac7c92cca51747b5f44b Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 2 May 2012 16:41:00 +0200 Subject: [PATCH] create folder 'remote' for the remote services like caldav, carddav and webdav --- .htaccess | 10 +++++++--- apps/calendar/appinfo/install.php | 4 ++++ apps/calendar/{caldav.php => appinfo/remote.php} | 5 ++--- apps/calendar/appinfo/update.php | 3 +++ apps/contacts/appinfo/install.php | 4 ++++ apps/contacts/{carddav.php => appinfo/remote.php} | 5 ++--- apps/contacts/appinfo/update.php | 4 ++++ apps/files/appinfo/install.php | 4 ++++ apps/files/{webdav.php => appinfo/remote.php} | 3 +-- apps/files/appinfo/update.php | 4 ++++ apps/inc.php | 1 - index.php | 2 +- lib/base.php | 2 -- 13 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 apps/calendar/appinfo/install.php rename apps/calendar/{caldav.php => appinfo/remote.php} (91%) create mode 100644 apps/contacts/appinfo/install.php rename apps/contacts/{carddav.php => appinfo/remote.php} (94%) create mode 100644 apps/contacts/appinfo/update.php create mode 100644 apps/files/appinfo/install.php rename apps/files/{webdav.php => appinfo/remote.php} (94%) create mode 100644 apps/files/appinfo/update.php delete mode 100644 apps/inc.php diff --git a/.htaccess b/.htaccess index 96ecb685d5..100975ef4c 100644 --- a/.htaccess +++ b/.htaccess @@ -1,5 +1,9 @@ ErrorDocument 403 /core/templates/403.php ErrorDocument 404 /core/templates/404.php +Redirect 301 /apps/calendar/caldav.php /remote/caldav.php +Redirect 301 /apps/contacts/carddav.php /remote/carddav.php +Redirect 301 /apps/files/webdav.php /remote/webdav.php +Redirect 301 /files/webdav.php /remote/webdav.php php_value upload_max_filesize 512M php_value post_max_size 512M @@ -11,7 +15,7 @@ php_value memory_limit 512M RewriteEngine on RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last] -RewriteRule ^.well-known/carddav /apps/contacts/carddav.php [R] -RewriteRule ^.well-known/caldav /apps/calendar/caldav.php [R] +RewriteRule ^.well-known/carddav /remote/carddav.php [R] +RewriteRule ^.well-known/caldav /remote/caldav.php [R] -Options -Indexes +Options -Indexes \ No newline at end of file diff --git a/apps/calendar/appinfo/install.php b/apps/calendar/appinfo/install.php new file mode 100644 index 0000000000..c5a9a72f26 --- /dev/null +++ b/apps/calendar/appinfo/install.php @@ -0,0 +1,4 @@ +setBaseUri(OC::$APPSWEBROOT.'/apps/calendar/caldav.php'); +$server->setBaseUri(OC::$WEBROOT.'/remote/caldav.php'); // Add plugins $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud')); $server->addPlugin(new Sabre_CalDAV_Plugin()); diff --git a/apps/calendar/appinfo/update.php b/apps/calendar/appinfo/update.php index 9f52f91392..78e4f2d874 100755 --- a/apps/calendar/appinfo/update.php +++ b/apps/calendar/appinfo/update.php @@ -15,3 +15,6 @@ if (version_compare($installedVersion, '0.2.1', '<')) { $r = $stmt->execute(array($color,$id)); } } +if(!file_exists(OC::$WEBROOT.'/remote/caldav.php')){ + file_put_contents(OC::$WEBROOT.'/remote/caldav.php', file_get_contents(OC::$APPROOT . '/apps/calendar/appinfo/remote.php')); +} \ No newline at end of file diff --git a/apps/contacts/appinfo/install.php b/apps/contacts/appinfo/install.php new file mode 100644 index 0000000000..b87241b2db --- /dev/null +++ b/apps/contacts/appinfo/install.php @@ -0,0 +1,4 @@ +. * */ - // Do not load FS ... $RUNTIME_NOSETUPFS = true; -require_once('../inc.php'); +require_once('../lib/base.php'); OC_Util::checkAppEnabled('contacts'); @@ -39,7 +38,7 @@ $nodes = array( // Fire up server $server = new Sabre_DAV_Server($nodes); -$server->setBaseUri(OC::$APPSWEBROOT.'/apps/contacts/carddav.php'); +$server->setBaseUri(OC::$WEBROOT.'/remote/carddav.php'); // Add plugins $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud')); $server->addPlugin(new Sabre_CardDAV_Plugin()); diff --git a/apps/contacts/appinfo/update.php b/apps/contacts/appinfo/update.php new file mode 100644 index 0000000000..b87241b2db --- /dev/null +++ b/apps/contacts/appinfo/update.php @@ -0,0 +1,4 @@ +setBaseUri(OC::$APPSWEBROOT.'/apps/files/webdav.php'); +$server->setBaseUri(OC::$WEBROOT.'/remote/webdav.php'); // Load plugins $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud')); diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php new file mode 100644 index 0000000000..d00a1a321e --- /dev/null +++ b/apps/files/appinfo/update.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/index.php b/index.php index 9c81928e11..b9872a906d 100644 --- a/index.php +++ b/index.php @@ -44,7 +44,7 @@ if($not_installed) { // Handle WebDAV if($_SERVER['REQUEST_METHOD']=='PROPFIND'){ - header('location: '.OC_Helper::linkToAbsolute('files','webdav.php')); + header('location: '.OC_Helper::linkToAbsolute('remote','webdav.php')); exit(); } diff --git a/lib/base.php b/lib/base.php index ff0450699e..40df2b0c56 100644 --- a/lib/base.php +++ b/lib/base.php @@ -451,8 +451,6 @@ class OC{ exit; } } - //update path to lib base - @file_put_contents(OC::$APPSROOT . '/apps/inc.php', ''); } }