From dfe09956559d53deff866c9035f8e7ffcf2cf5e2 Mon Sep 17 00:00:00 2001
From: RainLoop Team <support@rainloop.net>
Date: Fri, 20 Dec 2013 03:42:04 +0400
Subject: [PATCH] CardDAV digest/basic auth configuration Small fix

---
 .../app/libraries/RainLoop/Common/PdoAbstract.php    |  7 ++-----
 .../app/libraries/RainLoop/Config/Application.php    |  1 +
 .../0.0.0/app/libraries/RainLoop/ServiceActions.php  | 12 +++++++++---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Common/PdoAbstract.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Common/PdoAbstract.php
index 120a62b31..0f2f5c503 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Common/PdoAbstract.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Common/PdoAbstract.php
@@ -274,11 +274,8 @@ abstract class PdoAbstract
 		{
 			$oStmt->closeCursor();
 
-			$oStmt = $this->prepareAndExecute('INSERT INTO rainloop_users (rl_email, rl_hash) VALUES (:rl_email, :rl_hash)',
-				array(
-					':rl_email' => array($sEmail, \PDO::PARAM_STR),
-					':rl_hash' => array(\md5($sEmail.\microtime(true)), \PDO::PARAM_STR)
-				)
+			$oStmt = $this->prepareAndExecute('INSERT INTO rainloop_users (rl_email) VALUES (:rl_email)',
+				array(':rl_email' => array($sEmail, \PDO::PARAM_STR))
 			);
 
 			return $this->getUserId($sEmail, true);
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index b9dd4e888..77692b87c 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -206,6 +206,7 @@ Enables caching in the system'),
 				'cache_system_data' => array(true),
 				'use_app_debug_js' => array(false),
 				'use_app_debug_css' => array(false),
+				'use_dav_digest_auth' => array(false),
 				'login_fault_delay' => array(1),
 				'log_ajax_response_write_limit' => array(300),
 				'determine_user_language' => array(true),
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
index 896ff7d92..ed4d65bf8 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
@@ -729,11 +729,17 @@ class ServiceActions
 
 			$oPersonalAddressBookProvider = $this->oActions->PersonalAddressBookProvider();
 
-//			$oAuthBackend = new \RainLoop\SabreDAV\AuthBasic($oPersonalAddressBookProvider);
-			$oAuthBackend = new \RainLoop\SabreDAV\AuthDigest($oPersonalAddressBookProvider);
+			$oAuthBackend = null;
+			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);
-
 			$oPrincipalBackend = new \RainLoop\SabreDAV\Principal($oPersonalAddressBookProvider, $oAuthBackend);
 
 			$aNodes = array(