diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-05-05 22:54:14 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-05-05 22:54:14 +0200 |
| commit | c996600786080c54ba853ac8311fafdd3e814e78 (patch) | |
| tree | fac953a1e831f5305690be1dd5ac814b83daa726 /apps/calendar/appinfo | |
| parent | 6c2fc0cbe853027e265fdf9f1b05b75c5f92c187 (diff) | |
| download | nextcloud-server-c996600786080c54ba853ac8311fafdd3e814e78.tar.gz nextcloud-server-c996600786080c54ba853ac8311fafdd3e814e78.zip | |
push changes
Diffstat (limited to 'apps/calendar/appinfo')
| -rwxr-xr-x | apps/calendar/appinfo/app.php | 4 | ||||
| -rwxr-xr-x | apps/calendar/appinfo/remote.php | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php index 055066de0df..297d8e44b67 100755 --- a/apps/calendar/appinfo/app.php +++ b/apps/calendar/appinfo/app.php @@ -23,6 +23,4 @@ OCP\App::addNavigationEntry( array( 'name' => $l->t('Calendar'))); OCP\App::registerPersonal('calendar', 'settings'); OC_Search::registerProvider('OC_Search_Provider_Calendar'); -if(!file_exists(OC::$SERVERROOT.'/remote/caldav.php')){ - file_put_contents(OC::$SERVERROOT.'/remote/caldav.php', file_get_contents(OC::$APPSROOT . '/apps/calendar/appinfo/remote.php')); -}
\ No newline at end of file +OCP\CONFIG::setAppValue('core', 'caldav', '/apps/calendar/appinfo/remote.php');
\ No newline at end of file diff --git a/apps/calendar/appinfo/remote.php b/apps/calendar/appinfo/remote.php index 32b454ee90c..7ff6a2fbbe2 100755 --- a/apps/calendar/appinfo/remote.php +++ b/apps/calendar/appinfo/remote.php @@ -5,10 +5,6 @@ * later. * See the COPYING-README file. */ -// Do not load FS ... -$RUNTIME_NOSETUPFS = true; -require_once('../lib/base.php'); - OCP\App::checkAppEnabled('calendar'); // Backends @@ -24,7 +20,7 @@ $nodes = array( // Fire up server $server = new Sabre_DAV_Server($nodes); -$server->setBaseUri(OC::$WEBROOT.'/remote/caldav.php'); +$server->setBaseUri($baseuri); // Add plugins $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud')); $server->addPlugin(new Sabre_CalDAV_Plugin()); |