Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-25 18:19:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prepared ldap query to optionally read mail addresses

Browse source 
for main account and additional accounts
This commit is contained in:
cm-schl 2023-02-10 12:04:50 +01:00
parent 30e3a8cc0f
commit 424c1ff90a
3 changed files with 41 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

40
plugins/ldap-mail-accounts/LdapMailAccounts.php
View file

@ -84,7 +84,11 @@ class LdapMailAccounts
$this->config->objectclass,
$this->config->field_name,
$this->config->field_username,
$this->config->field_domain
$this->config->field_domain,
$this->config->bool_overwrite_mail_address_main_account,
$this->config->field_mail_address_main_account,
$this->config->bool_overwrite_mail_address_additional_account,
$this->config->field_mail_address_additional_account
);
}
catch (LdapMailAccountsException $e) {
@ -264,6 +268,10 @@ class LdapMailAccounts
* @param string $nameField
* @param string $usernameField
* @param string $domainField
* @param bool $overwriteMailMainAccount
* @param string $mailAddressFieldMainAccount
* @param bool $overwriteMailAdditionalAccount
* @param string $mailAddressFieldAdditionalAccount
* @return LdapMailAccountResult[]
* @throws LdapMailAccountsException
*/
@ -274,7 +282,11 @@ class LdapMailAccounts
string $objectClass,
string $nameField,
string $usernameField,
string $domainField): array
string $domainField,
bool $overwriteMailMainAccount,
string $mailAddressFieldMainAccount,
bool $overwriteMailAdditionalAccount,
string $mailAddressFieldAdditionalAccount): array
{
$this->EnsureBound();
$nameField = strtolower($nameField);
@ -284,7 +296,20 @@ class LdapMailAccounts
$filter = "(&(objectclass=$objectClass)($searchField=$searchString))";
$this->logger->Write("Used ldap filter to search for additional mail accounts: $filter", \LOG_NOTICE, self::LOG_KEY);
$ldapResult = @ldap_search($this->ldap, $searchBase, $filter, ['dn', $usernameField, $nameField, $domainField]);
//Set together the attributes to search inside the LDAP
$ldapAttributes = ['dn', $usernameField, $nameField, $domainField];
if ($overwriteMailMainAccount)
{
\array_push($ldapAttributes, $mailAddressFieldMainAccount);
}
if ($overwriteMailAdditionalAccount)
{
\array_push($ldapAttributes, $mailAddressFieldAdditionalAccount);
}
$ldapResult = @ldap_search($this->ldap, $searchBase, $filter, $ldapAttributes);
if (!$ldapResult) {
$this->HandleLdapError("Fetch $objectClass");
return [];
@ -311,6 +336,9 @@ class LdapMailAccounts
$result->domain = $this->LdapGetAttribute($entry, $domainField, true, true);
$result->domain = $this->RemoveEventualLocalPart($result->domain);
$result->mailMainAccount = $this->LdapGetAttribute($entry, $mailAddressFieldMainAccount, true, $overwriteMailMainAccount);
$result->mailAdditionalAccount = $this->LdapGetAttribute($entry, $mailAddressFieldAdditionalAccount, true, $overwriteMailAdditionalAccount);
$results[] = $result;
}
@ -407,4 +435,10 @@ class LdapMailAccountResult
/** @var string */
public $domain;
/** @var string */
public $mailMainAccount;
/** @var string */
public $mailAdditionalAccount;
}