Working remote.php with webdav and caldav
This commit is contained in:
parent
c996600786
commit
f69f764e8b
|
@ -19,5 +19,6 @@ RewriteRule ^.well-known/carddav /remote/carddav.php [R]
|
|||
RewriteRule ^.well-known/caldav /remote/caldav.php [R]
|
||||
|
||||
RewriteRule ^apps/([^/]*)/(.*\.(css|php))$ index.php?app=$1&getfile=$2 [QSA,L]
|
||||
RewriteRule ^remote/(.*) remote.php [QSA,L]
|
||||
</IfModule>
|
||||
Options -Indexes
|
||||
|
|
|
@ -215,7 +215,7 @@ class Sabre_DAV_Server {
|
|||
$DOM->appendChild($error);
|
||||
|
||||
$error->appendChild($DOM->createElement('s:exception',get_class($e)));
|
||||
$error->appendChild($DOM->createElement('s:message',$e->getMessage()));
|
||||
$error->appendChild($DOM->createElement('s:message',htmlentities($e->getMessage())));
|
||||
if ($this->debugExceptions) {
|
||||
$error->appendChild($DOM->createElement('s:file',$e->getFile()));
|
||||
$error->appendChild($DOM->createElement('s:line',$e->getLine()));
|
||||
|
|
|
@ -37,7 +37,7 @@ $publicDir = new OC_Connector_Sabre_Directory('');
|
|||
|
||||
// Fire up server
|
||||
$server = new Sabre_DAV_Server($publicDir);
|
||||
$server->setBaseUri(OC::$WEBROOT.'/remote/webdav.php');
|
||||
$server->setBaseUri($baseuri);
|
||||
|
||||
// Load plugins
|
||||
$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud'));
|
||||
|
|
12
remote.php
12
remote.php
|
@ -2,11 +2,15 @@
|
|||
$RUNTIME_NOSETUPFS = true;
|
||||
//$RUNTIME_NOAPPS = TRUE;
|
||||
require_once('lib/base.php');
|
||||
$file = OCP\CONFIG::getAppValue('core', $_GET['service']);
|
||||
$path_info = $_SERVER['PATH_INFO'];
|
||||
if (!$pos = strpos($path_info, '/', 1)) {
|
||||
$pos = strlen($path_info);
|
||||
}
|
||||
$service=substr($path_info, 1, $pos-1);
|
||||
$file = OCP\CONFIG::getAppValue('core', $service);
|
||||
if(is_null($file)){
|
||||
header('HTTP/1.0 404 Not Found');
|
||||
exit;
|
||||
}
|
||||
$baseuri = OC::$WEBROOT . '/remote.php?service=' . $_GET['service'] . '&p=';
|
||||
parse_str($_GET['p'], $_GET);
|
||||
require_once(OC::$APPSROOT . $file);
|
||||
$baseuri = '/remote.php/'.$service.'/';
|
||||
require_once(OC::$APPSROOT . $file);
|
||||
|
|
Loading…
Reference in New Issue