diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-26 23:56:29 +0400 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-26 23:56:29 +0400 |
| commit | 5fda0e4b3b65c9bb0be4c627a0db87431875760a (patch) | |
| tree | 2c325744e89eb793ecf66a92cc539453f74ff4c7 | |
| parent | 6930af4c0fd9ca251a2eda5d345cb7d71c3f475d (diff) | |
make *DAV work with movable apps
| -rw-r--r-- | apps/calendar/caldav.php | 2 | ||||
| -rw-r--r-- | apps/contacts/carddav.php | 2 | ||||
| -rw-r--r-- | apps/files/webdav.php | 3 | ||||
| -rw-r--r-- | apps/inc.php | 1 | ||||
| -rw-r--r-- | lib/base.php | 4 |
5 files changed, 9 insertions, 3 deletions
diff --git a/apps/calendar/caldav.php b/apps/calendar/caldav.php index a319fd05223..7210b25879f 100644 --- a/apps/calendar/caldav.php +++ b/apps/calendar/caldav.php @@ -8,7 +8,7 @@ // Do not load FS ... $RUNTIME_NOSETUPFS = true; - +require_once('../inc.php'); OC_Util::checkAppEnabled('calendar'); diff --git a/apps/contacts/carddav.php b/apps/contacts/carddav.php index 794fb890898..1a11ccdb3f7 100644 --- a/apps/contacts/carddav.php +++ b/apps/contacts/carddav.php @@ -22,7 +22,7 @@ // Do not load FS ... $RUNTIME_NOSETUPFS = true; - +require_once('../inc.php'); OC_Util::checkAppEnabled('contacts'); diff --git a/apps/files/webdav.php b/apps/files/webdav.php index 3418eba5a6c..940bbfef52e 100644 --- a/apps/files/webdav.php +++ b/apps/files/webdav.php @@ -25,6 +25,7 @@ // Do not load FS ... $RUNTIME_NOSETUPFS = true; +require_once('../inc.php'); // only need filesystem apps $RUNTIME_APPTYPES=array('filesystem','authentication'); @@ -40,7 +41,7 @@ $publicDir = new OC_Connector_Sabre_Directory(''); // Fire up server $server = new Sabre_DAV_Server($publicDir); -$server->setBaseUri(OC::$WEBROOT.'/files/webdav.php'); +$server->setBaseUri(OC::$APPSWEBROOT.'/apps/files/webdav.php'); // Load plugins $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud')); diff --git a/apps/inc.php b/apps/inc.php new file mode 100644 index 00000000000..cbfab014173 --- /dev/null +++ b/apps/inc.php @@ -0,0 +1 @@ +<?php require_once('/Applications/MAMP/htdocs/owncloud/lib/base.php'); ?>
\ No newline at end of file diff --git a/lib/base.php b/lib/base.php index fa4c9850a3b..ba378653f47 100644 --- a/lib/base.php +++ b/lib/base.php @@ -413,6 +413,7 @@ class OC{ //make sure temporary files are cleaned up register_shutdown_function(array('OC_Helper','cleanTmp')); + //parse the given parameters self::$REQUESTEDAPP = (isset($_GET['app'])?strip_tags($_GET['app']):'files'); self::$REQUESTEDFILE = (isset($_GET['getfile'])?$_GET['getfile']:null); if(substr_count(self::$REQUESTEDFILE, '?') != 0){ @@ -432,6 +433,9 @@ class OC{ exit; } } + + //update path to lib base + file_put_contents(OC::$APPSROOT . '/apps/inc.php', '<?php require_once(\'' . OC::$SERVERROOT . '/lib/base.php' . '\'); ?>'); } } |