From 90a3107edd4f545df0ec4c08927182b5a2ade8de Mon Sep 17 00:00:00 2001 From: Marvin Date: Sun, 25 Jun 2017 23:34:32 +0200 Subject: [PATCH] handle escaped @ symbol fixes Apple AddressBook problems Signed-off-by: Marvin Winkler --- lib/imap.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/imap.php b/lib/imap.php index 4c5c57a..d98b299 100644 --- a/lib/imap.php +++ b/lib/imap.php @@ -46,6 +46,12 @@ class OC_User_IMAP extends \OCA\user_external\Base { return false; } + // Replace escaped @ symbol in uid (which is a mail address) + // but only if there is no @ symbol and if there is a %40 inside the uid + if (!(strpos($uid, '@') !== false) && (strpos($uid, '%40') !== false)) { + $uid = str_replace("%40","@",$uid); + } + // Check if we only want logins from ONE domain and strip the domain part from UID if($this->domain != '') { $pieces = explode('@', $uid);