mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-30 04:29:21 +03:00
Merge branch 'upstream/master' into dev/sync-nextcloud-addressbook
This commit is contained in:
commit
957654c746
1528 changed files with 85567 additions and 32765 deletions
|
|
@ -345,7 +345,7 @@ class KolabAddressBook implements \RainLoop\Providers\AddressBook\AddressBookInt
|
|||
|
||||
$sSearch = \MailSo\Imap\SearchCriterias::escapeSearchString($this->ImapClient(), $sSearch);
|
||||
$aUids = \array_slice(
|
||||
$this->ImapClient()->MessageSimpleSearch("FROM {$sSearch}"),
|
||||
$this->ImapClient()->MessageSearch("FROM {$sSearch}"),
|
||||
0, $iLimit
|
||||
);
|
||||
|
||||
|
|
@ -366,7 +366,7 @@ class KolabAddressBook implements \RainLoop\Providers\AddressBook\AddressBookInt
|
|||
if ($bCreateAuto) {
|
||||
foreach ($aEmails as $sEmail => $sAddress) {
|
||||
$sSearch = \MailSo\Imap\SearchCriterias::escapeSearchString($this->ImapClient(), $sEmail);
|
||||
if (!$this->ImapClient()->MessageSimpleSearch("FROM {$sSearch}")) {
|
||||
if (!$this->ImapClient()->MessageSearch("FROM {$sSearch}")) {
|
||||
$oVCard = new VCard;
|
||||
$oVCard->add('EMAIL', $sEmail);
|
||||
$sFullName = \trim(\MailSo\Mime\Email::Parse(\trim($sAddress))->GetDisplayName());
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue