Include domain-admins in domain-table (#3136)

Adds a listing of the domain-admins to each domain in the domain listing.
master
Max 2019-11-11 09:55:15 +01:00 committed by André Peters
parent f626c078be
commit 3243bf42cd
15 changed files with 43 additions and 20 deletions

View File

@ -3147,6 +3147,15 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
$AliasDataDomain = $stmt->fetch(PDO::FETCH_ASSOC); $AliasDataDomain = $stmt->fetch(PDO::FETCH_ASSOC);
(isset($AliasDataDomain['alias_count'])) ? $domaindata['aliases_in_domain'] = $AliasDataDomain['alias_count'] : $domaindata['aliases_in_domain'] = "0"; (isset($AliasDataDomain['alias_count'])) ? $domaindata['aliases_in_domain'] = $AliasDataDomain['alias_count'] : $domaindata['aliases_in_domain'] = "0";
$domaindata['aliases_left'] = $row['aliases'] - $AliasDataDomain['alias_count']; $domaindata['aliases_left'] = $row['aliases'] - $AliasDataDomain['alias_count'];
if ($_SESSION['mailcow_cc_role'] == "admin")
{
$stmt = $pdo->prepare("SELECT GROUP_CONCAT(`username` SEPARATOR ', ') AS domain_admins FROM `domain_admins` WHERE `domain` = :domain");
$stmt->execute(array(
':domain' => $_data
));
$domain_admins = $stmt->fetch(PDO::FETCH_ASSOC);
(isset($domain_admins['domain_admins'])) ? $domaindata['domain_admins'] = $domain_admins['domain_admins'] : $domaindata['domain_admins'] = "-";
}
return $domaindata; return $domaindata;
break; break;
case 'mailbox_details': case 'mailbox_details':

View File

@ -233,6 +233,7 @@ jQuery(function($){
{"name":"max_quota_for_mbox","title":lang.mailbox_quota,"breakpoints":"xs sm","style":{"width":"125px"}}, {"name":"max_quota_for_mbox","title":lang.mailbox_quota,"breakpoints":"xs sm","style":{"width":"125px"}},
{"name":"rl","title":"RL","breakpoints":"xs sm md lg","style":{"maxWidth":"100px","width":"100px"}}, {"name":"rl","title":"RL","breakpoints":"xs sm md lg","style":{"maxWidth":"100px","width":"100px"}},
{"name":"backupmx","filterable": false,"style":{"maxWidth":"120px","width":"120px"},"title":lang.backup_mx,"breakpoints":"xs sm md lg"}, {"name":"backupmx","filterable": false,"style":{"maxWidth":"120px","width":"120px"},"title":lang.backup_mx,"breakpoints":"xs sm md lg"},
{"name":"domain_admins","title":lang.domain_admins,"style":{"word-break":"break-all","min-width":"200px"},"breakpoints":"xs sm md lg","filterable":(role == "admin"),"visible":(role == "admin")},
{"name":"active","filterable": false,"style":{"maxWidth":"80px","width":"80px"},"title":lang.active}, {"name":"active","filterable": false,"style":{"maxWidth":"80px","width":"80px"},"title":lang.active},
{"name":"action","filterable": false,"sortable": false,"style":{"text-align":"right","maxWidth":"240px","width":"240px"},"type":"html","title":lang.action,"breakpoints":"xs sm md"} {"name":"action","filterable": false,"sortable": false,"style":{"text-align":"right","maxWidth":"240px","width":"240px"},"type":"html","title":lang.action,"breakpoints":"xs sm md"}
], ],

View File

@ -298,6 +298,7 @@
"active": "Actiu", "active": "Actiu",
"action": "Acció", "action": "Acció",
"backup_mx": "Backup MX", "backup_mx": "Backup MX",
"domain_admins": "Administradores de dominio",
"domain_aliases": "Àlies de domini", "domain_aliases": "Àlies de domini",
"target_domain": "Domini destí", "target_domain": "Domini destí",
"target_address": "Direcció Goto", "target_address": "Direcció Goto",

View File

@ -563,6 +563,7 @@
"active": "Aktivní", "active": "Aktivní",
"action": "Akce", "action": "Akce",
"backup_mx": "Záložní MX", "backup_mx": "Záložní MX",
"domain_admins": "Správci domén",
"domain_aliases": "Doménové aliasy", "domain_aliases": "Doménové aliasy",
"target_domain": "Cílová doména", "target_domain": "Cílová doména",
"target_address": "Cílová adresa", "target_address": "Cílová adresa",

View File

@ -569,6 +569,7 @@
"active": "Aktiv", "active": "Aktiv",
"action": "Aktion", "action": "Aktion",
"backup_mx": "Backup MX", "backup_mx": "Backup MX",
"domain_admins": "Domain-Administratoren",
"domain_aliases": "Domain-Aliasse", "domain_aliases": "Domain-Aliasse",
"target_domain": "Ziel-Domain", "target_domain": "Ziel-Domain",
"target_address": "Ziel-Adresse", "target_address": "Ziel-Adresse",

View File

@ -568,6 +568,7 @@
"active": "Active", "active": "Active",
"action": "Action", "action": "Action",
"backup_mx": "Backup MX", "backup_mx": "Backup MX",
"domain_admins": "Domain administrators",
"domain_aliases": "Domain aliases", "domain_aliases": "Domain aliases",
"target_domain": "Target domain", "target_domain": "Target domain",
"target_address": "Goto address", "target_address": "Goto address",

View File

@ -262,6 +262,7 @@
"active": "Activo", "active": "Activo",
"action": "Acción", "action": "Acción",
"backup_mx": "MX de respaldo", "backup_mx": "MX de respaldo",
"domain_admins": "Administradores por dominio",
"domain_aliases": "Alias de dominio", "domain_aliases": "Alias de dominio",
"target_domain": "Dominio destino", "target_domain": "Dominio destino",
"target_address": "Dirección destino", "target_address": "Dirección destino",

View File

@ -563,6 +563,7 @@
"active": "Aktiivinen", "active": "Aktiivinen",
"action": "Toiminnot", "action": "Toiminnot",
"backup_mx": "Varmuuskopiointi MX", "backup_mx": "Varmuuskopiointi MX",
"domain_admins": "Verkkotunnuksien järjestelmänvalvojat",
"domain_aliases": "Domain alueiden aliakset", "domain_aliases": "Domain alueiden aliakset",
"target_domain": "Kohde verkkotunnus alue", "target_domain": "Kohde verkkotunnus alue",
"target_address": "Siiretty osoitteseen", "target_address": "Siiretty osoitteseen",

View File

@ -259,6 +259,7 @@
"active": "Actif", "active": "Actif",
"action": "Action", "action": "Action",
"backup_mx": "MX de secours", "backup_mx": "MX de secours",
"domain_admins": "Administrateurs de domaines",
"domain_aliases": "Alias de domaine", "domain_aliases": "Alias de domaine",
"target_domain": "Domaine cible", "target_domain": "Domaine cible",
"target_address": "Adresse cible", "target_address": "Adresse cible",

View File

@ -182,6 +182,7 @@
"active": "Attiva", "active": "Attiva",
"action": "Azione", "action": "Azione",
"backup_mx": "Backup MX", "backup_mx": "Backup MX",
"domain_admins": "Amministratori di dominio",
"domain_aliases": "Alias di domini", "domain_aliases": "Alias di domini",
"target_domain": "Target domain", "target_domain": "Target domain",
"target_address": "Vai ad indirizzo", "target_address": "Vai ad indirizzo",

View File

@ -303,6 +303,7 @@
"active": "Aktīvs", "active": "Aktīvs",
"action": "Rīcība", "action": "Rīcība",
"backup_mx": "Rezerves kopija MX", "backup_mx": "Rezerves kopija MX",
"domain_admins": "Domēna administratori",
"domain_aliases": "Domēna aliases", "domain_aliases": "Domēna aliases",
"target_domain": "Mērķa domēns", "target_domain": "Mērķa domēns",
"target_address": "Doties uz adresi", "target_address": "Doties uz adresi",

View File

@ -565,6 +565,7 @@
"active": "Actief", "active": "Actief",
"action": "Handeling", "action": "Handeling",
"backup_mx": "Secundaire MX", "backup_mx": "Secundaire MX",
"domain_admins": "Domeinbeheerders",
"domain_aliases": "Domeinaliassen", "domain_aliases": "Domeinaliassen",
"target_domain": "Doeldomein", "target_domain": "Doeldomein",
"target_address": "Doeladres", "target_address": "Doeladres",

View File

@ -258,6 +258,7 @@
"active": "Aktywny", "active": "Aktywny",
"action": "Działanie", "action": "Działanie",
"backup_mx": "Backup MX", "backup_mx": "Backup MX",
"domain_admins": "Administratorzy domeny",
"domain_aliases": "Aliasy domeny", "domain_aliases": "Aliasy domeny",
"target_domain": "Domena docelowa", "target_domain": "Domena docelowa",
"target_address": "Adres Idź do", "target_address": "Adres Idź do",

View File

@ -148,6 +148,7 @@
"active": "Ativo", "active": "Ativo",
"action": "Ação", "action": "Ação",
"backup_mx": "Backup MX", "backup_mx": "Backup MX",
"domain_admins": "Administradores de domínio",
"domain_aliases": "Encaminhamento de Domínio", "domain_aliases": "Encaminhamento de Domínio",
"target_domain": "Domínio Destino", "target_domain": "Domínio Destino",
"target_address": "Encaminhar para", "target_address": "Encaminhar para",

View File

@ -259,6 +259,7 @@
"active": "Активный", "active": "Активный",
"action": "Действия", "action": "Действия",
"backup_mx": "Резервное копирование MX", "backup_mx": "Резервное копирование MX",
"domain_admins": "Администраторы домена",
"domain_aliases": "Псевдонимы доменов", "domain_aliases": "Псевдонимы доменов",
"target_domain": "Целевой домен", "target_domain": "Целевой домен",
"target_address": "Основной адрес", "target_address": "Основной адрес",