YakumoLabs/nextcloud-user_external
4
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly merge master

Browse Source
This commit is contained in:
Pierre Ozoux
2017-12-08 15:39:06 +01:00
committed by GitHub
parent 59b8bb34aa
commit 40b92ae6fe
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/imap.php
View File

@@ -46,6 +46,12 @@ class OC_User_IMAP extends \OCA\user_external\Base {
return false; 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);
}
$result = OC_DB::executeAudited( $result = OC_DB::executeAudited(
'SELECT `userid` FROM `*PREFIX*preferences`' 'SELECT `userid` FROM `*PREFIX*preferences`'
. ' WHERE `appid` = "settings" AND `configkey` = "email" AND `configvalue` = ?', . ' WHERE `appid` = "settings" AND `configkey` = "email" AND `configvalue` = ?',
@@ -56,12 +62,6 @@ class OC_User_IMAP extends \OCA\user_external\Base {
$users[] = $row['userid']; $users[] = $row['userid'];
} }
// 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);
}
if(count($users) === 1) { if(count($users) === 1) {
$username = $uid; $username = $uid;
$uid = $users[0]; $uid = $users[0];