|
@@ -1027,10 +1027,10 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
}
|
|
}
|
|
$template_attr = null;
|
|
$template_attr = null;
|
|
if ($_data['template']){
|
|
if ($_data['template']){
|
|
- $template_attr = mailbox('get', 'mailbox_templates', $_data['template'])['attributes'];
|
|
|
|
|
|
+ $template_attr = mailbox('get', 'mailbox_templates', $_data['template'], $_extra)['attributes'];
|
|
}
|
|
}
|
|
if (empty($template_attr)) {
|
|
if (empty($template_attr)) {
|
|
- $template_attr = mailbox('get', 'mailbox_templates')[0]['attributes'];
|
|
|
|
|
|
+ $template_attr = mailbox('get', 'mailbox_templates', null, $_extra)[0]['attributes'];
|
|
}
|
|
}
|
|
$MAILBOX_DEFAULT_ATTRIBUTES = array_merge($MAILBOX_DEFAULT_ATTRIBUTES, $template_attr);
|
|
$MAILBOX_DEFAULT_ATTRIBUTES = array_merge($MAILBOX_DEFAULT_ATTRIBUTES, $template_attr);
|
|
|
|
|
|
@@ -4711,7 +4711,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
|
return $mailboxdata;
|
|
return $mailboxdata;
|
|
break;
|
|
break;
|
|
case 'mailbox_templates':
|
|
case 'mailbox_templates':
|
|
- if ($_SESSION['mailcow_cc_role'] != "admin" && $_SESSION['mailcow_cc_role'] != "domainadmin") {
|
|
|
|
|
|
+ if ($_SESSION['mailcow_cc_role'] != "admin" && $_SESSION['mailcow_cc_role'] != "domainadmin" && !$_extra['iam_create_login']) {
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
$_data = (isset($_data)) ? intval($_data) : null;
|
|
$_data = (isset($_data)) ? intval($_data) : null;
|