public/mailcow-dockerized
1
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2025-12-13 09:56:01 +00:00
Code Issues Releases Wiki Activity

Add error message when mailbox creation fails

Browse Source
This commit is contained in:
FreddleSpl0it
2025-03-14 09:36:40 +01:00
parent 5a7275843a
commit e21696ff27
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
data/conf/phpfpm/crons/ldap-sync.php
View File

@@ -79,7 +79,7 @@ if ($iam_settings['authsource'] != "ldap" || (intval($iam_settings['periodic_syn
// Set pagination variables // Set pagination variables
$start = 0; $start = 0;
$max = 25; $max = 100;
// lock sync if already running // lock sync if already running
$lock_file = '/tmp/iam-sync.lock'; $lock_file = '/tmp/iam-sync.lock';
@@ -126,11 +126,13 @@ foreach ($response as $user) {
$mailcow_template = $user[$iam_settings['attribute_field']][0]; $mailcow_template = $user[$iam_settings['attribute_field']][0];
// try get mailbox user // try get mailbox user
$stmt = $pdo->prepare("SELECT `mailbox`.* FROM `mailbox` $stmt = $pdo->prepare("SELECT
INNER JOIN domain on mailbox.domain = domain.domain mailbox.*,
WHERE `kind` NOT REGEXP 'location|thing|group' domain.active AS d_active
AND `domain`.`active`='1' FROM `mailbox`
AND `username` = :user"); INNER JOIN domain on mailbox.domain = domain.domain
WHERE `kind` NOT REGEXP 'location|thing|group'
AND `username` = :user");
$stmt->execute(array(':user' => $user[$iam_settings['username_field']][0])); $stmt->execute(array(':user' => $user[$iam_settings['username_field']][0]));
$row = $stmt->fetch(PDO::FETCH_ASSOC); $row = $stmt->fetch(PDO::FETCH_ASSOC);
@@ -156,13 +158,17 @@ foreach ($response as $user) {
if (!$row && intval($iam_settings['import_users']) == 1){ if (!$row && intval($iam_settings['import_users']) == 1){
// mailbox user does not exist, create... // mailbox user does not exist, create...
logMsg("info", "Creating user " . $user[$iam_settings['username_field']][0]); logMsg("info", "Creating user " . $user[$iam_settings['username_field']][0]);
mailbox('add', 'mailbox_from_template', array( $create_res = mailbox('add', 'mailbox_from_template', array(
'domain' => explode('@', $user[$iam_settings['username_field']][0])[1], 'domain' => explode('@', $user[$iam_settings['username_field']][0])[1],
'local_part' => explode('@', $user[$iam_settings['username_field']][0])[0], 'local_part' => explode('@', $user[$iam_settings['username_field']][0])[0],
'name' => $user['displayname'][0], 'name' => $user['displayname'][0],
'authsource' => 'ldap', 'authsource' => 'ldap',
'template' => $mbox_template 'template' => $mbox_template
)); ));
if (!$create_res){
logMsg("err", "Could not create user " . $user[$iam_settings['username_field']][0]);
continue;
}
} else if ($row && intval($iam_settings['periodic_sync']) == 1) { } else if ($row && intval($iam_settings['periodic_sync']) == 1) {
// mailbox user does exist, sync attribtues... // mailbox user does exist, sync attribtues...
logMsg("info", "Syncing attributes for user " . $user[$iam_settings['username_field']][0]); logMsg("info", "Syncing attributes for user " . $user[$iam_settings['username_field']][0]);