mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-09-07 08:27:03 +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
|
|
@ -5,6 +5,7 @@ namespace RainLoop;
|
|||
if (!\defined('RAINLOOP_APP_ROOT_PATH'))
|
||||
{
|
||||
\define('RAINLOOP_APP_LIBRARIES_PATH', \rtrim(\realpath(__DIR__), '\\/').'/libraries/');
|
||||
\define('RAINLOOP_MB_SUPPORTED', \function_exists('mb_strtoupper'));
|
||||
|
||||
\spl_autoload_register(function ($sClassName) {
|
||||
|
||||
|
|
@ -14,6 +15,12 @@ if (!\defined('RAINLOOP_APP_ROOT_PATH'))
|
|||
}
|
||||
else if (0 === \strpos($sClassName, 'Sabre') && false !== \strpos($sClassName, '\\'))
|
||||
{
|
||||
if (!RAINLOOP_MB_SUPPORTED && !defined('RL_MB_FIXED'))
|
||||
{
|
||||
\define('RL_MB_FIXED', true);
|
||||
include_once RAINLOOP_APP_LIBRARIES_PATH.'RainLoop/SabreDAV/MbStringFix.php';
|
||||
}
|
||||
|
||||
return include RAINLOOP_APP_LIBRARIES_PATH.'Sabre/'.\str_replace('\\', '/', \substr($sClassName, 6)).'.php';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -201,7 +201,7 @@ Enables caching in the system'),
|
|||
'ignore_folders_subscription' => array(false,
|
||||
'Experimental settings. Handle with care.
|
||||
'),
|
||||
'sync_dav_digest_auth' => array(false),
|
||||
'sync_dav_digest_auth' => array(true),
|
||||
'sync_dav_domain' => array(''),
|
||||
'sync_use_dav_browser' => array(true),
|
||||
'allow_message_append' => array(false),
|
||||
|
|
|
|||
|
|
@ -408,8 +408,11 @@ if (!function_exists('mb_strcut'))
|
|||
{
|
||||
function mb_strcut($str, $start, $length = null, $encoding = '')
|
||||
{
|
||||
// TODO
|
||||
return \MailSo\Base\Utils::Utf8Clear(substr($str, $start, $length));
|
||||
$match = array();
|
||||
// use the regex unicode support to separate the UTF-8 characters into an array
|
||||
preg_match_all( '/./us', $str, $match );
|
||||
$chars = is_null( $length )? array_slice( $match[0], $start ) : array_slice( $match[0], $start, $length );
|
||||
return implode( '', $chars );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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());
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<!DOCTYPE html>
|
||||
<html id="id-html">
|
||||
<html id="id-html" class="no-js rl-booted-trigger rl-started-trigger">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
<div id="rl-loading-error" class="thm-loading">
|
||||
An Error occurred,<br />please refresh the page and try again.
|
||||
</div>
|
||||
<div id="rl-content">
|
||||
<div id="rl-content" class="startup-animation">
|
||||
<div id="rl-popups"></div>
|
||||
<div id="rl-center">
|
||||
<div id="rl-top"></div>
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@
|
|||
.thm-body {
|
||||
color: @main-color;
|
||||
background-color: @main-background-color;
|
||||
background-size: @main-background-size;
|
||||
.thm-body-background-image(@main-background-image);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
@main-color: #333;
|
||||
@main-background-color: #e3e3e3;
|
||||
@main-background-image: none; // "images/background.png"
|
||||
@main-background-size: contain;
|
||||
|
||||
// LOADING
|
||||
@loading-color: #000; // #ddd
|
||||
|
|
|
|||
|
|
@ -25,9 +25,9 @@
|
|||
<br />
|
||||
<label data-bind="click: function () { contactsSync(!contactsSync()); }">
|
||||
<i data-bind="css: contactsSync() ? 'icon-checkbox-checked' : 'icon-checkbox-unchecked'"></i>
|
||||
Allow contacts sync (CardDAV)
|
||||
Allow contacts sync (CardDAV) <span style="color:red">beta</span>
|
||||
</label>
|
||||
<a href="http://rainloop.net/docs/carddav/" target="_blank">read about web server configuration</a>
|
||||
<a href="http://rainloop.net/docs/web-servers/" target="_blank">Web server configuration examples</a>
|
||||
</div>
|
||||
</div>
|
||||
<br />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue