Skip to content

Commit

Permalink
show created_on, last_modified for domain, mailbox
Browse files Browse the repository at this point in the history
  • Loading branch information
FreddleSpl0it committed Nov 11, 2022
1 parent 79982e0 commit c8f69ff
Show file tree
Hide file tree
Showing 20 changed files with 100 additions and 2 deletions.
10 changes: 10 additions & 0 deletions data/web/inc/functions.mailbox.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -4028,6 +4028,8 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
`mailboxes`,
`defquota`,
`maxquota`,
`created`,
`modified`,
`quota`,
`relayhost`,
`relay_all_recipients`,
Expand Down Expand Up @@ -4100,6 +4102,8 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
$domaindata['relay_all_recipients_int'] = $row['relay_all_recipients'];
$domaindata['relay_unknown_only'] = $row['relay_unknown_only'];
$domaindata['relay_unknown_only_int'] = $row['relay_unknown_only'];
$domaindata['created'] = $row['created'];
$domaindata['modified'] = $row['modified'];
$stmt = $pdo->prepare("SELECT COUNT(`address`) AS `alias_count` FROM `alias`
WHERE (`domain`= :domain OR `domain` IN (SELECT `alias_domain` FROM `alias_domain` WHERE `target_domain` = :domain2))
AND `address` NOT IN (
Expand Down Expand Up @@ -4184,6 +4188,8 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
`mailbox`.`domain`,
`mailbox`.`local_part`,
`mailbox`.`quota`,
`mailbox`.`created`,
`mailbox`.`modified`,
`quota2`.`bytes`,
`attributes`,
`quota2`.`messages`
Expand All @@ -4202,6 +4208,8 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
`mailbox`.`domain`,
`mailbox`.`local_part`,
`mailbox`.`quota`,
`mailbox`.`created`,
`mailbox`.`modified`,
`quota2replica`.`bytes`,
`attributes`,
`quota2replica`.`messages`
Expand All @@ -4228,6 +4236,8 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
$mailboxdata['attributes'] = json_decode($row['attributes'], true);
$mailboxdata['quota_used'] = intval($row['bytes']);
$mailboxdata['percent_in_use'] = ($row['quota'] == 0) ? '- ' : round((intval($row['bytes']) / intval($row['quota'])) * 100);
$mailboxdata['created'] = $row['created'];
$mailboxdata['modified'] = $row['modified'];

if ($mailboxdata['percent_in_use'] === '- ') {
$mailboxdata['percent_class'] = "info";
Expand Down
24 changes: 24 additions & 0 deletions data/web/js/site/mailbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,18 @@ jQuery(function($){
defaultContent: '',
className: 'none'
},
{
title: lang.created_on,
data: 'created',
defaultContent: '',
className: 'none'
},
{
title: lang.last_modified,
data: 'modified',
defaultContent: '',
className: 'none'
},
{
title: 'Tags',
data: 'tags',
Expand Down Expand Up @@ -1008,6 +1020,18 @@ jQuery(function($){
defaultContent: '',
responsivePriority: 5
},
{
title: lang.created_on,
data: 'created',
defaultContent: '',
className: 'none'
},
{
title: lang.last_modified,
data: 'modified',
defaultContent: '',
className: 'none'
},
{
title: 'Tags',
data: 'tags',
Expand Down
4 changes: 4 additions & 0 deletions data/web/lang/lang.cs-cz.json
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,7 @@
"bcc_dest_format": "Cíl kopie musí být jedna platná email adresa. Pokud potřebujete posílat kopie na více adres, vytvořte Alias a použijte jej zde.",
"client_id": "ID klienta",
"client_secret": "Tajný klíč klienta",
"created_on": "Vytvoreno",
"comment_info": "Soukromý komentář se nezobrazí uživateli; veřejný komentář se zobrazí jako nápověda při zastavení se kurzorem v přehledu uživatelů",
"delete1": "Odstranit ze zdrojové schránky, po dokončení přenosu",
"delete2": "Odstranit zprávy v cílové schránce, pokud nejsou ve zdrojové",
Expand Down Expand Up @@ -534,6 +535,7 @@
"hostname": "Jméno hostitele",
"inactive": "Neaktivní",
"kind": "Druh",
"last_modified": "Naposledy změněn",
"lookup_mx": "Cíl je regulární výraz který se shoduje s MX záznamem (<code>.*google\\.com</code> směřuje veškerou poštu na MX které jsou cílem pro google.com přes tento skok)",
"mailbox": "Úprava mailové schránky",
"mailbox_quota_def": "Výchozí kvóta schránky",
Expand Down Expand Up @@ -701,6 +703,7 @@
"booking_ltnull": "Neomezeno, ale po rezervaci se ukazuje jako obsazené",
"booking_lt0_short": "Volný limit",
"catch_all": "Doménový koš",
"created_on": "Vytvoreno",
"daily": "Každý den",
"deactivate": "Vypnout",
"description": "Popis",
Expand Down Expand Up @@ -731,6 +734,7 @@
"insert_preset": "Vložit ukázkovou položku \"%s\"",
"kind": "Druh",
"last_mail_login": "Poslední přihlášení",
"last_modified": "Naposledy změněn",
"last_pw_change": "Naposledy změněno heslo",
"last_run": "Naposledy spuštěno",
"last_run_reset": "Znovu naplánovat",
Expand Down
4 changes: 4 additions & 0 deletions data/web/lang/lang.de-de.json
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,7 @@
"client_id": "Client-ID",
"client_secret": "Client-Secret",
"comment_info": "Ein privater Kommentar ist für den Benutzer nicht einsehbar. Ein öffentlicher Kommentar wird als Tooltip im Interface des Benutzers angezeigt.",
"created_on": "Erstellt am",
"delete1": "Lösche Nachricht nach Übertragung vom Quell-Server",
"delete2": "Lösche Nachrichten von Ziel-Server, die nicht auf Quell-Server vorhanden sind",
"delete2duplicates": "Lösche Duplikate im Ziel",
Expand All @@ -573,6 +574,7 @@
"hostname": "Servername",
"inactive": "Inaktiv",
"kind": "Art",
"last_modified": "Zuletzt geändert",
"lookup_mx": "Ziel mit MX vergleichen (Regex, etwa <code>.*google\\.com</code>, um alle Ziele mit MX *google.com zu routen)",
"mailbox": "Mailbox bearbeiten",
"mailbox_quota_def": "Standard-Quota einer Mailbox",
Expand Down Expand Up @@ -741,6 +743,7 @@
"booking_custom_short": "Hartes Limit",
"booking_ltnull": "Unbegrenzt, jedoch anzeigen, wenn gebucht",
"booking_lt0_short": "Weiches Limit",
"created_on": "Erstellt am",
"daily": "Täglich",
"deactivate": "Deaktivieren",
"description": "Beschreibung",
Expand Down Expand Up @@ -769,6 +772,7 @@
"insert_preset": "Beispiel \"%s\" laden",
"kind": "Art",
"last_mail_login": "Letzter Mail-Login",
"last_modified": "Zuletzt geändert",
"last_pw_change": "Letzte Passwortänderung",
"last_run": "Letzte Ausführung",
"last_run_reset": "Als nächstes ausführen",
Expand Down
4 changes: 4 additions & 0 deletions data/web/lang/lang.en-gb.json
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,7 @@
"client_id": "Client ID",
"client_secret": "Client secret",
"comment_info": "A private comment is not visible to the user, while a public comment is shown as tooltip when hovering it in a user's overview",
"created_on": "Created on",
"delete1": "Delete from source when completed",
"delete2": "Delete messages on destination that are not on source",
"delete2duplicates": "Delete duplicates on destination",
Expand All @@ -576,6 +577,7 @@
"hostname": "Hostname",
"inactive": "Inactive",
"kind": "Kind",
"last_modified": "Last modified",
"lookup_mx": "Destination is a regular expression to match against MX name (<code>.*google\\.com</code> to route all mail targeted to a MX ending in google.com over this hop)",
"mailbox": "Edit mailbox",
"mailbox_quota_def": "Default mailbox quota",
Expand Down Expand Up @@ -748,6 +750,7 @@
"booking_ltnull": "Unlimited, but show as busy when booked",
"booking_lt0_short": "Soft limit",
"catch_all": "Catch-All",
"created_on": "Created on",
"daily": "Daily",
"deactivate": "Deactivate",
"description": "Description",
Expand Down Expand Up @@ -779,6 +782,7 @@
"insert_preset": "Insert example preset \"%s\"",
"kind": "Kind",
"last_mail_login": "Last mail login",
"last_modified": "Last modified",
"last_pw_change": "Last password change",
"last_run": "Last run",
"last_run_reset": "Schedule next",
Expand Down
2 changes: 2 additions & 0 deletions data/web/lang/lang.es-es.json
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,7 @@
"hostname": "Hostname",
"inactive": "Inactivo",
"kind": "Tipo",
"last_modified": "Última modificación",
"mailbox": "Editar buzón",
"mailbox_quota_def": "Cuota de buzón predeterminada",
"max_aliases": "Máx. alias:",
Expand Down Expand Up @@ -509,6 +510,7 @@
"in_use": "En uso (%)",
"inactive": "Inactivo",
"kind": "Tipo",
"last_modified": "Última modificación",
"last_run": "Última ejecución",
"mailbox_defquota": "Tamaño de buzón predeterminado",
"mailbox_quota": "Tamaño máx. de cuota",
Expand Down
2 changes: 2 additions & 0 deletions data/web/lang/lang.fi-fi.json
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,7 @@
"hostname": "Hostname",
"inactive": "Passiivinen",
"kind": "Kiltti",
"last_modified": "Viimeksi muokattu",
"mailbox": "Muokkaa sähköposti tiliä",
"mailbox_quota_def": "Sähköpostin oletus kiintiö",
"max_aliases": "Maks. Aliaksia",
Expand Down Expand Up @@ -580,6 +581,7 @@
"in_use": "Käytössä (%)",
"inactive": "Epäaktiivinen",
"kind": "Sellainen",
"last_modified": "Viimeksi muokattu",
"last_run": "Viimeisin suoritus",
"last_run_reset": "Ajoita seuraava",
"mailbox": "Postilaatikko",
Expand Down
2 changes: 2 additions & 0 deletions data/web/lang/lang.fr-fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,7 @@
"hostname": "Nom d'hôte",
"inactive": "Inactif",
"kind": "Type",
"last_modified": "Dernière modification",
"mailbox": "Edition de la boîte mail",
"mailbox_quota_def": "Quota par défaut de la boîte",
"max_aliases": "Nombre max. d'alias",
Expand Down Expand Up @@ -684,6 +685,7 @@
"insert_preset": "Insérer un exemple de préréglage \"%s\"",
"kind": "Type",
"last_mail_login": "Dernière connexion mail",
"last_modified": "Dernière modification",
"last_run": "Dernière éxécution",
"last_run_reset": "Calendrier suivant",
"mailbox": "Mailbox",
Expand Down
4 changes: 4 additions & 0 deletions data/web/lang/lang.it-it.json
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,7 @@
"bcc_dest_format": "BCC destination must be a single valid email address.",
"client_id": "Client ID",
"client_secret": "Client secret",
"created_on": "Creato il",
"comment_info": "A private comment is not visible to the user, while a public comment is shown as tooltip when hovering it in a user's overview",
"delete1": "Elimina dalla sorgente al termine",
"delete2": "Delete messages on destination that are not on source",
Expand Down Expand Up @@ -536,6 +537,7 @@
"hostname": "Hostname",
"inactive": "Inattivo",
"kind": "Genere",
"last_mail_login": "Last mail login",
"lookup_mx": "Destination is a regular expression to match against MX name (<code>.*google\\.com</code> to route all mail targeted to a MX ending in google.com over this hop)",
"mailbox": "Modifica casella di posta",
"mailbox_quota_def": "Default mailbox quota",
Expand Down Expand Up @@ -706,6 +708,7 @@
"booking_custom_short": "Hard limit",
"booking_ltnull": "Unlimited, but show as busy when booked",
"booking_lt0_short": "Soft limit",
"created_on": "Creato il",
"daily": "Giornaliero",
"deactivate": "Disattiva",
"description": "Descrizione",
Expand All @@ -732,6 +735,7 @@
"insert_preset": "Insert example preset \"%s\"",
"kind": "Tipo",
"last_mail_login": "Last mail login",
"last_modified": "Ultima modifica",
"last_pw_change": "Ultima modifica della password",
"last_run": "Ultima esecuzione",
"last_run_reset": "Schedule next",
Expand Down
2 changes: 2 additions & 0 deletions data/web/lang/lang.ko-kr.json
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,7 @@
"hostname": "Hostname",
"inactive": "Inactive",
"kind": "Kind",
"last_modified": "Last modified",
"mailbox": "Edit mailbox",
"mailbox_quota_def": "Default mailbox quota",
"max_aliases": "Max. aliases",
Expand Down Expand Up @@ -650,6 +651,7 @@
"insert_preset": "Insert example preset \"%s\"",
"kind": "Kind",
"last_mail_login": "Last mail login",
"last_modified": "Last modified",
"last_run": "Last run",
"last_run_reset": "Schedule next",
"mailbox": "Mailbox",
Expand Down
2 changes: 2 additions & 0 deletions data/web/lang/lang.nl-nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,7 @@
"hostname": "Hostname",
"inactive": "Inactief",
"kind": "Soort",
"last_modified": "Voor het laatst bijgewerkt op",
"mailbox": "Wijzig mailbox",
"mailbox_quota_def": "Standaard mailboxquota",
"max_aliases": "Maximaal aantal aliassen",
Expand Down Expand Up @@ -674,6 +675,7 @@
"insert_preset": "Voeg voorbeelden in \"%s\"",
"kind": "Soort",
"last_mail_login": "Laatste mail login",
"last_modified": "Voor het laatst bijgewerkt op",
"last_run": "Laatst uitgevoerd",
"last_run_reset": "Plan volgende",
"mailbox": "Mailbox",
Expand Down
4 changes: 4 additions & 0 deletions data/web/lang/lang.ro-ro.json
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,7 @@
"client_id": "ID Client",
"client_secret": "Secret client",
"comment_info": "Un comentariu privat nu este vizibil pentru utilizator, în timp ce un comentariu public este afișat ca un tooltip când se trece peste el într-o privire de ansamblu asupra utilizatorilor",
"created_on": "Creat în",
"delete1": "Șterge de la sursă când ai terminat",
"delete2": "Șterge mesajele la destinație care nu sunt la sursă",
"delete2duplicates": "Șterge duplicate la destinație",
Expand All @@ -537,6 +538,7 @@
"hostname": "Nume gazdă",
"inactive": "Inactiv",
"kind": "Fel",
"last_modified": "Ultima modificare",
"lookup_mx": "Destinația este o expresie regulată care potrivită cu numele MX (<code>.*google\\.com</code> pentru a direcționa toate e-mailurile vizate către un MX care se termină în google.com peste acest hop)",
"mailbox": "Editează căsuța poștală",
"mailbox_quota_def": "Cota implicită a căsuței poștale",
Expand Down Expand Up @@ -707,6 +709,7 @@
"booking_ltnull": "Nelimitat, dar arată ca ocupat atunci când este rezervat",
"booking_lt0_short": "Limită redusă",
"catch_all": "Prinde-Tot",
"created_on": "Creat în",
"daily": "Zilnic",
"deactivate": "Deactivează",
"description": "Descriere",
Expand Down Expand Up @@ -737,6 +740,7 @@
"insert_preset": "Inserați un exemplu presetat \"%s\"",
"kind": "Fel",
"last_mail_login": "Ultima autentificare pe mail",
"last_modified": "Ultima modificare",
"last_pw_change": "Ultima modificare a parolei",
"last_run": "Ultima rulare",
"last_run_reset": "Programează următorul",
Expand Down
4 changes: 4 additions & 0 deletions data/web/lang/lang.ru-ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,7 @@
"client_id": "ID клиента",
"client_secret": "Секретный ключ пользователя",
"comment_info": "Приватный комментарий не виден пользователям, а публичный - отображается рядом с псевдонимом в личном кабинете пользователя",
"created_on": "Дата создания",
"delete1": "Удаление из источника после завершения",
"delete2": "Удаление писем по месту назначения, которые не находятся на исходном",
"delete2duplicates": "Удаление дубликатов по назначению",
Expand All @@ -537,6 +538,7 @@
"hostname": "Имя хоста",
"inactive": "Неактивный",
"kind": "Тип",
"last_modified": "Последние изменения",
"lookup_mx": "Назначение на основе резовинга MX записи по регулярному выражению (<code>.*\\.example\\.com$</code> для маршрутизации всей почты через этот хост, если MX заканчивающийся на example.com)",
"mailbox": "Изменение почтового аккаунта",
"mailbox_quota_def": "Квота по умолчанию",
Expand Down Expand Up @@ -705,6 +707,7 @@
"booking_ltnull": "Неограниченный, занят при бронировании",
"booking_lt0_short": "Неограниченный лимит",
"catch_all": "Catch-all",
"created_on": "Дата создания",
"daily": "Раз в день",
"deactivate": "Отключить",
"description": "Описание",
Expand Down Expand Up @@ -735,6 +738,7 @@
"insert_preset": "Вставить пример \"%s\"",
"kind": "Тип",
"last_mail_login": "Последний вход",
"last_modified": "Последние изменения",
"last_pw_change": "Последняя смена пароля",
"last_run": "Последний запуск",
"last_run_reset": "Следующей запуск",
Expand Down
4 changes: 4 additions & 0 deletions data/web/lang/lang.sk-sk.json
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,7 @@
"client_id": "ID klienta",
"client_secret": "Klientský tajný kľúč",
"comment_info": " Súkromný komentár nie je viditeľný používateľovi, na rozdiel od verejného komentára, ktorý je prezentovaný ako popis v prehľade používateľov",
"created_on": "Vytvorené",
"delete1": "Vymazať zo zdrojovej schránky, po dokončení prenosu",
"delete2": "Vymazať správy v cieľovej schránke, ak nie sú v zdrojovej",
"delete2duplicates": "Vymazať duplikáty v cieľovej schránke",
Expand All @@ -536,6 +537,7 @@
"hostname": "Hostiteľ",
"inactive": "Neaktívny",
"kind": "Druh",
"last_modified": "Naposledy upravené",
"lookup_mx": "Cieľ je regulárny výraz ktorý sa zhoduje s MX záznamom (<code>.*google\\.com</code> smeruje všetku poštu na MX ktoré sú cieľom pre google.com cez tento skok)",
"mailbox": "Upraviť mailovú schránku",
"mailbox_quota_def": "Predvolená veľkosť mailovej schránky",
Expand Down Expand Up @@ -707,6 +709,7 @@
"booking_ltnull": "Bez limitu, ale zobraziť obsadené po rezervácii",
"booking_lt0_short": "Voľný limit",
"catch_all": "Doménový kôš",
"created_on": "Vytvorené",
"daily": "Denný",
"deactivate": "Deaktivovať",
"description": "Popis",
Expand Down Expand Up @@ -737,6 +740,7 @@
"insert_preset": "Vložiť vzor nastavenia \"%s\"",
"kind": "Druh",
"last_mail_login": "Posledné prihlásenie",
"last_modified": "Naposledy upravené",
"last_pw_change": "Naposledy zmenené heslo",
"last_run": "Posledné spustenie",
"last_run_reset": "Znovu naplánovať",
Expand Down
Loading

0 comments on commit c8f69ff

Please sign in to comment.