Merge pull request #6390 from mailcow/nightly

Nightly 2025-03 to staging
This commit is contained in:
FreddleSpl0it 2025-03-25 07:36:20 +01:00 committed by GitHub
commit d584dd387e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -123,8 +123,6 @@ $response = $ldap_query->where($iam_settings['username_field'], "*")
// Process the users
foreach ($response as $user) {
$mailcow_template = $user[$iam_settings['attribute_field']][0];
// try get mailbox user
$stmt = $pdo->prepare("SELECT
mailbox.*,
@ -137,7 +135,7 @@ foreach ($response as $user) {
$row = $stmt->fetch(PDO::FETCH_ASSOC);
// check if matching attribute mapping exists
$user_template = $user_res[$iam_settings['attribute_field']][0];
$user_template = $user[$iam_settings['attribute_field']][0];
$mapper_key = array_search($user_template, $iam_settings['mappers']);
if (empty($user[$iam_settings['username_field']][0])){