summaryrefslogtreecommitdiffstats
path: root/apps/calendar
diff options
context:
space:
mode:
authorFrank Karlitschek <karlitschek@kde.org>2012-02-26 18:26:41 +0100
committerFrank Karlitschek <karlitschek@kde.org>2012-02-26 18:26:41 +0100
commitab96fa67c886d8ba2a4e930930f8e7a7b95e9cfa (patch)
treefac73ffb45fb63ec648b5d372f01b69931add004 /apps/calendar
parent8148480cfe2ca263f493d042866a809a45ee05af (diff)
downloadnextcloud-server-ab96fa67c886d8ba2a4e930930f8e7a7b95e9cfa.tar.gz
nextcloud-server-ab96fa67c886d8ba2a4e930930f8e7a7b95e9cfa.zip
first part of the abstraction work of the apps folder. more to come
Diffstat (limited to 'apps/calendar')
-rw-r--r--apps/calendar/ajax/import/import.php4
-rw-r--r--apps/calendar/caldav.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/calendar/ajax/import/import.php b/apps/calendar/ajax/import/import.php
index 96d7af48341..c0797f6e425 100644
--- a/apps/calendar/ajax/import/import.php
+++ b/apps/calendar/ajax/import/import.php
@@ -11,7 +11,7 @@ require_once('../../../../lib/base.php');
OC_JSON::checkLoggedIn();
OC_Util::checkAppEnabled('calendar');
$nl = "\n";
-$progressfile = OC::$SERVERROOT . '/apps/calendar/import_tmp/' . md5(session_id()) . '.txt';
+$progressfile = OC::$APPSROOT . '/apps/calendar/import_tmp/' . md5(session_id()) . '.txt';
if(is_writable('import_tmp/')){
$progressfopen = fopen($progressfile, 'w');
fwrite($progressfopen, '10');
@@ -117,4 +117,4 @@ sleep(3);
if(is_writable('import_tmp/')){
unlink($progressfile);
}
-OC_JSON::success(); \ No newline at end of file
+OC_JSON::success();
diff --git a/apps/calendar/caldav.php b/apps/calendar/caldav.php
index db0b35da118..e0925c54ee7 100644
--- a/apps/calendar/caldav.php
+++ b/apps/calendar/caldav.php
@@ -25,7 +25,7 @@ $nodes = array(
// Fire up server
$server = new Sabre_DAV_Server($nodes);
-$server->setBaseUri(OC::$WEBROOT.'/apps/calendar/caldav.php');
+$server->setBaseUri(OC::$APPSROOT.'/apps/calendar/caldav.php');
// Add plugins
$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud'));
$server->addPlugin(new Sabre_CalDAV_Plugin());