Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

CardDAV digest/basic auth configuration

Browse source 
Small fix
This commit is contained in:
RainLoop Team 2013-12-20 03:42:04 +04:00
parent 276e4504af
commit dfe0995655
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rainloop/v/0.0.0/app/libraries/RainLoop/Common/PdoAbstract.php
View file

@ -274,11 +274,8 @@ abstract class PdoAbstract
{ {
$oStmt->closeCursor(); $oStmt->closeCursor();
$oStmt = $this->prepareAndExecute('INSERT INTO rainloop_users (rl_email, rl_hash) VALUES (:rl_email, :rl_hash)', $oStmt = $this->prepareAndExecute('INSERT INTO rainloop_users (rl_email) VALUES (:rl_email)',
array( array(':rl_email' => array($sEmail, \PDO::PARAM_STR))
':rl_email' => array($sEmail, \PDO::PARAM_STR),
':rl_hash' => array(\md5($sEmail.\microtime(true)), \PDO::PARAM_STR)
)
); );
return $this->getUserId($sEmail, true); return $this->getUserId($sEmail, true);

1
rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
View file

@ -206,6 +206,7 @@ Enables caching in the system'),
'cache_system_data' => array(true), 'cache_system_data' => array(true),
'use_app_debug_js' => array(false), 'use_app_debug_js' => array(false),
'use_app_debug_css' => array(false), 'use_app_debug_css' => array(false),
'use_dav_digest_auth' => array(false),
'login_fault_delay' => array(1), 'login_fault_delay' => array(1),
'log_ajax_response_write_limit' => array(300), 'log_ajax_response_write_limit' => array(300),
'determine_user_language' => array(true), 'determine_user_language' => array(true),

12
rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
View file

@ -729,11 +729,17 @@ class ServiceActions
$oPersonalAddressBookProvider = $this->oActions->PersonalAddressBookProvider(); $oPersonalAddressBookProvider = $this->oActions->PersonalAddressBookProvider();
// $oAuthBackend = new \RainLoop\SabreDAV\AuthBasic($oPersonalAddressBookProvider); $oAuthBackend = null;
$oAuthBackend = new \RainLoop\SabreDAV\AuthDigest($oPersonalAddressBookProvider); if ($this->Config()->Get('labs', 'use_dav_digest_auth', false))
{
$oAuthBackend = new \RainLoop\SabreDAV\AuthDigest($oPersonalAddressBookProvider);
}
else
{
$oAuthBackend = new \RainLoop\SabreDAV\AuthBasic($oPersonalAddressBookProvider);
}
$oCarddavBackend = new \RainLoop\SabreDAV\CardDAV($oPersonalAddressBookProvider, $oAuthBackend); $oCarddavBackend = new \RainLoop\SabreDAV\CardDAV($oPersonalAddressBookProvider, $oAuthBackend);
$oPrincipalBackend = new \RainLoop\SabreDAV\Principal($oPersonalAddressBookProvider, $oAuthBackend); $oPrincipalBackend = new \RainLoop\SabreDAV\Principal($oPersonalAddressBookProvider, $oAuthBackend);
$aNodes = array( $aNodes = array(