mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-09-05 07:27:04 +03:00
1.6.0 release
CardDav support. New skin (Blurred). Login animation. Small fixes.
This commit is contained in:
parent
bc6c320ecb
commit
011855bf8a
26 changed files with 386 additions and 337 deletions
|
|
@ -715,8 +715,6 @@ class ServiceActions
|
|||
{
|
||||
try
|
||||
{
|
||||
include_once RAINLOOP_APP_LIBRARIES_PATH.'RainLoop/SabreDAV/MbStringFix.php';
|
||||
|
||||
\set_error_handler(function ($errno, $errstr, $errfile, $errline ) {
|
||||
throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
|
||||
});
|
||||
|
|
@ -741,20 +739,22 @@ class ServiceActions
|
|||
|
||||
$oAddressBookRoot = new \Sabre\CardDAV\AddressBookRoot($oPrincipalBackend, $oCarddavBackend);
|
||||
|
||||
$oServer = new \Sabre\DAV\Server(array(
|
||||
$oPrincipalCollection, $oAddressBookRoot
|
||||
));
|
||||
$aTree = array($oPrincipalCollection, $oAddressBookRoot);
|
||||
$this->Plugins()->RunHook('filter.sabre-dav-tree', array(&$aTree));
|
||||
|
||||
if (false === \strpos($this->oHttp->GetUrl(), '/index.php/dav/'))
|
||||
{
|
||||
$oServer->setBaseUri('/');
|
||||
}
|
||||
else
|
||||
$oServer = new \Sabre\DAV\Server($aTree);
|
||||
|
||||
$sBaseUri = '/';
|
||||
if (false !== \strpos($this->oHttp->GetUrl(), '/index.php/dav/'))
|
||||
{
|
||||
$aPath = \trim($this->oHttp->GetPath(), '/\\ ');
|
||||
$oServer->setBaseUri((0 < \strlen($aPath) ? '/'.$aPath : '').'/index.php/dav/');
|
||||
$sBaseUri = (0 < \strlen($aPath) ? '/'.$aPath : '').'/index.php/dav/';
|
||||
}
|
||||
|
||||
$this->Plugins()->RunHook('filter.sabre-dav-base-url', array(&$sBaseUri));
|
||||
|
||||
$oServer->setBaseUri($sBaseUri);
|
||||
|
||||
// Plugins
|
||||
$oServer->addPlugin(new \Sabre\DAV\Auth\Plugin($oAuthBackend, 'RainLoop'));
|
||||
$oServer->addPlugin(new \Sabre\CardDAV\Plugin());
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue