self-hosted/mailcow-dockerized
1
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2024-12-23 02:04:46 +02:00
Code Issues Releases Activity

add temporary email description

Browse Source
This commit is contained in:
Filip Marek 2024-08-09 17:23:48 +02:00
parent ed2837edd8
commit 60ca25026d
29 changed files with 70 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data/web/inc/functions.mailbox.inc.php
View File

@ -48,6 +48,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
$_data["validity"] = 8760;
}
$domain = $_data['domain'];
$description = $_data['description'];
$valid_domains[] = mailbox('get', 'mailbox_details', $username)['domain'];
$valid_alias_domains = user_get_alias_details($username)['alias_domains'];
if (!empty($valid_alias_domains)) {
@ -62,10 +63,11 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
return false;
}
$validity = strtotime("+" . $_data["validity"] . " hour");
$stmt = $pdo->prepare("INSERT INTO `spamalias` (`address`, `goto`, `validity`) VALUES
(:address, :goto, :validity)");
$stmt = $pdo->prepare("INSERT INTO `spamalias` (`address`, `description`, `goto`, `validity`) VALUES
(:address, :description, :goto, :validity)");
$stmt->execute(array(
':address' => readable_random_string(rand(rand(3, 9), rand(3, 9))) . '.' . readable_random_string(rand(rand(3, 9), rand(3, 9))) . '@' . $domain,
':description' => $description,
':goto' => $username,
':validity' => $validity
));
@ -4201,6 +4203,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
}
$stmt = $pdo->prepare("SELECT `address`,
`goto`,
`description`,
`validity`,
`created`,
`modified`

1
data/web/inc/init_db.inc.php
View File

@ -527,6 +527,7 @@ function init_db_schema() {
"cols" => array(
"address" => "VARCHAR(255) NOT NULL",
"goto" => "TEXT NOT NULL",
"description" => "TEXT NOT NULL",
"created" => "DATETIME(0) NOT NULL DEFAULT NOW(0)",
"modified" => "DATETIME ON UPDATE CURRENT_TIMESTAMP",
"validity" => "INT(11)"

5
data/web/js/site/user.js
View File

@ -202,6 +202,11 @@ jQuery(function($){
data: 'address',
defaultContent: ''
},
{
title: lang.description,
data: 'description',
defaultContent: ''
},
{
title: lang.alias_valid_until,
data: 'validity',

1
data/web/lang/lang.ca-es.json
View File

@ -493,6 +493,7 @@
"client_configuration": "Guies de configuració per als clients de correu més habituals",
"create_syncjob": "Afegir treball de sincronitzaió",
"day": "Dia",
"description": "Descripció",
"direct_aliases": "Adreces àlies directes",
"direct_aliases_desc": "Els àlies directes sí que es veuen afectat per la configuració de l'usuari",
"eas_reset": "Fer un reset de la cache d'ActiveSync del dispositiu",

1
data/web/lang/lang.cs-cz.json
View File

@ -1164,6 +1164,7 @@
"created_on": "Vytvoreno",
"daily": "Každý den",
"day": "den",
"description": "Popis",
"delete_ays": "Potvrďte odstranění.",
"direct_aliases": "Přímé aliasy",
"direct_aliases_desc": "Na přímé aliasy se uplatňuje filtr spamu a nastavení pravidel TLS",

1
data/web/lang/lang.da-dk.json
View File

@ -971,6 +971,7 @@
"create_syncjob": "Opret nyt sync job",
"daily": "Dagligt",
"day": "dag",
"description": "Beskrivelse",
"delete_ays": "Bekræft venligst ønsket om sletning.",
"direct_aliases": "Direkte alias addresser",
"direct_aliases_desc": "Direkte alias-adresser påvirkes af spamfilter og TLS-politiske indstillinger.",

1
data/web/lang/lang.de-de.json
View File

@ -1185,6 +1185,7 @@
"created_on": "Erstellt am",
"daily": "Täglich",
"day": "Tag",
"description": "Beschreibung",
"delete_ays": "Soll der Löschvorgang wirklich ausgeführt werden?",
"direct_aliases": "Direkte Alias-Adressen",
"direct_aliases_desc": "Nur direkte Alias-Adressen werden für benutzerdefinierte Einstellungen berücksichtigt.",

1
data/web/lang/lang.en-gb.json
View File

@ -1192,6 +1192,7 @@
"created_on": "Created on",
"daily": "Daily",
"day": "day",
"description": "Description",
"delete_ays": "Please confirm the deletion process.",
"direct_aliases": "Direct alias addresses",
"direct_aliases_desc": "Direct alias addresses are affected by spam filter and TLS policy settings.",

1
data/web/lang/lang.es-es.json
View File

@ -709,6 +709,7 @@
"create_syncjob": "Crear nuevo trabajo de sincronización",
"daily": "Cada día",
"day": "Día",
"description": "Descripción",
"direct_aliases": "Alias directos",
"direct_aliases_desc": "Los alias directos se ven afectadas por el filtro de correo no deseado y la configuración de la política TLS del usuario.",
"eas_reset": "Resetear el caché ActiveSync",

1
data/web/lang/lang.fi-fi.json
View File

@ -810,6 +810,7 @@
"create_syncjob": "Luo uusi synkronointi työ",
"daily": "Päivittäin",
"day": "Päivä",
"description": "Kuvaus",
"direct_aliases": "Suorat alias osoitteet",
"direct_aliases_desc": "Roska posti suodatus-ja TLS-käytäntö asetukset vaikuttavat suora aliaksen osoitteisiin.",
"eas_reset": "Tyhjennä ActiveSync-laitteen väli muisti",

1
data/web/lang/lang.fr-fr.json
View File

@ -1101,6 +1101,7 @@
"create_syncjob": "Créer une tâche de synchronisation",
"daily": "Quotidien",
"day": "jour",
"description": "Description",
"delete_ays": "Veuillez confirmer le processus de suppression.",
"direct_aliases": "Adresses alias directes",
"direct_aliases_desc": "Les adresses d’alias directes sont affectées par le filtre anti-spam et les paramètres de politique TLS.",

1
data/web/lang/lang.hu-hu.json
View File

@ -406,6 +406,7 @@
"create_syncjob": "Új szinkronizációs művelet létrehozása",
"daily": "Napi",
"day": "nap",
"description": "Leírás",
"delete_ays": "Erősítse meg a törlést.",
"direct_aliases": "Közvetlen alias címek",
"eas_reset": "ActiveSync eszköz gyorsítótár ürítése",

1
data/web/lang/lang.it-it.json
View File

@ -1126,6 +1126,7 @@
"created_on": "Creato il",
"daily": "Giornaliero",
"day": "giorno",
"description": "Descrizione",
"delete_ays": "Please confirm the deletion process.",
"direct_aliases": "Direct alias addresses",
"direct_aliases_desc": "Direct alias addresses are affected by spam filter and TLS policy settings.",

1
data/web/lang/lang.ko-kr.json
View File

@ -911,6 +911,7 @@
"create_syncjob": "새 동기화 작업 생성",
"daily": "매일",
"day": "일",
"description": "Description",
"delete_ays": "진짜 삭제하겠습니까?",
"direct_aliases": "Direct alias addresses",
"direct_aliases_desc": "Direct alias addresses are affected by spam filter and TLS policy settings.",

1
data/web/lang/lang.lv-lv.json
View File

@ -551,6 +551,7 @@
"client_configuration": "Parādīt konfigurācijas norādes e-pasta klientiem un tālruņiem",
"create_syncjob": "Izveidot jaunu sinhronizācijas darbu",
"day": "Dienas",
"description": "Apraksts",
"direct_aliases": "Tiešas aizstājadreses",
"direct_aliases_desc": "Tiešās aizstājadreses ir surogātpasta atlasīšanas un TLS nosacījumu iestatījumu ietekmētas.",
"eas_reset": "Atiestatīt ActiveSync ierīces kešatmiņu",

1
data/web/lang/lang.nl-nl.json
View File

@ -1028,6 +1028,7 @@
"create_syncjob": "Voeg sync job toe",
"daily": "Dagelijks",
"day": "dag",
"description": "Beschrijving",
"delete_ays": "Bevestig de verwijdering.",
"direct_aliases": "Directe aliasadressen",
"direct_aliases_desc": "Directe aliasadressen worden beïnvloed door spamfilters en het versleutelingsbeleid.",

1
data/web/lang/lang.pl-pl.json
View File

@ -363,6 +363,7 @@
"create_syncjob": "Utwórz nowe polecenie synchronizacji",
"daily": "Co dzień",
"day": "Dzień",
"description": "Opis",
"direct_aliases": "Aliasy bezpośrednie",
"direct_aliases_desc": "Na aliasy bezpośrednie wpływają filtry spamu i ustawienia TLS.",
"eas_reset": "Zresetuj pamięć podręczną urządzenia ActiveSync",

1
data/web/lang/lang.pt-br.json
View File

@ -1186,6 +1186,7 @@
"created_on": "Criado em",
"daily": "Diariamente",
"day": "dia",
"description": "Descrição",
"delete_ays": "Confirme o processo de exclusão.",
"direct_aliases": "Endereços de alias diretos",
"direct_aliases_desc": "Os endereços de alias diretos são afetados pelo filtro de spam e pelas configurações da política TLS.",

1
data/web/lang/lang.pt-pt.json
View File

@ -236,6 +236,7 @@
"aliases_send_as_all": "Não verificar remetente para os domínios",
"change_password": "Alterar senha",
"day": "Dia",
"description": "Descrição",
"edit": "Editar",
"hour": "Hora",
"hours": "Horas",

1
data/web/lang/lang.ro-ro.json
View File

@ -1064,6 +1064,7 @@
"created_on": "Creat în",
"daily": "Zilnic",
"day": "zi",
"description": "Descriere",
"delete_ays": "Vă rugăm să confirmați stergerea.",
"direct_aliases": "Adrese alias directe",
"direct_aliases_desc": "Adresele alias directe sunt afectate de setările filtrului de spam și ale politicii TLS.",

1
data/web/lang/lang.ru-ru.json
View File

@ -1192,6 +1192,7 @@
"created_on": "Дата создания",
"daily": "Раз в день",
"day": "день",
"description": "Описание",
"delete_ays": "Пожалуйста, подтвердите удаление",
"direct_aliases": "Личные псевдонимы",
"direct_aliases_desc": "На личные псевдонимы распространяются фильтры нежелательной почты и параметры политики TLS.",

1
data/web/lang/lang.sk-sk.json
View File

@ -1116,6 +1116,7 @@
"created_on": "Vytvorené",
"daily": "Denne",
"day": "deň",
"description": "Popis",
"delete_ays": "Potvrďte zmazanie.",
"direct_aliases": "Priame alias adresy",
"direct_aliases_desc": "Priame aliasy sú ovplyvnené spam filtrom a nastavením TLS pravidiel.",

1
data/web/lang/lang.sv-se.json
View File

@ -993,6 +993,7 @@
"created_on": "Skapad vid",
"daily": "Dagligen",
"day": "dag",
"description": "Beskrivning",
"delete_ays": "Är du säker att du vill ta bort det här objektet?",
"direct_aliases": "Direkta aliasadresser",
"direct_aliases_desc": "Endast direkta aliasadresser påverkas av spamfilter och TLS-policyföreskrifter.",

1
data/web/lang/lang.tr-tr.json
View File

@ -1207,6 +1207,7 @@
"created_on": "Oluşturulma tarihi",
"daily": "Günlük",
"day": "Gün",
"description": "Açıklama",
"delete_ays": "Lütfen silme işlemini onaylayın.",
"direct_aliases": "Doğrudan takma ad adresleri",
"eas_reset_help": "Birçok durumda cihaz önbelleğini sıfırlama, bozuk bir ActiveSync profilini kurtarmaya yardımcı olur.<br><b>Dikkat:</b> Tüm öğeler yeniden indirilecek!",

1
data/web/lang/lang.uk-ua.json
View File

@ -1135,6 +1135,7 @@
"created_on": "Дата створення",
"daily": "Раз на день",
"day": "день",
"description": "Опис",
"delete_ays": "Будь ласка, підтвердіть видалення.",
"eas_reset": "Скинути кеш ActiveSync пристроїв",
"eas_reset_help": "У багатьох випадках скидання кешу пристроїв допомагає відновити пошкоджений профіль ActiveSync.<br><b>Увага:</b> всі листи, календарі та контакти будуть завантажені заново на всі ваші пристрої!",

1
data/web/lang/lang.zh-cn.json
View File

@ -1164,6 +1164,7 @@
"created_on": "添加于",
"daily": "每日",
"day": "日",
"description": "描述",
"delete_ays": "请确认删除。",
"direct_aliases": "直接别名",
"direct_aliases_desc": "垃圾邮件过滤和 TLS 策略会作用于直接别名。",

1
data/web/lang/lang.zh-tw.json
View File

@ -1140,6 +1140,7 @@
"created_on": "建立於",
"daily": "每日",
"day": "日",
"description": "描述",
"delete_ays": "請確認刪除。",
"direct_aliases": "直接別名",
"direct_aliases_desc": "直接別名會受到垃圾郵件過濾器和 TLS 規則限制。",

29
data/web/templates/modals/user.twig
View File

@ -340,31 +340,22 @@
<div class="modal fade" id="tempAliasModal" tabindex="-1" role="dialog" aria-labelledby="tempAliasModalLabel">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h3 class="modal-title">{{ lang.user.alias_create_random }}</h3>
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body">
<form class="form-horizontal" data-cached-form="false" data-id="pwchange" role="form" method="post" autocomplete="off">
<div class="row">
<label class="control-label col-sm-3" for="user_new_pass">{{ lang.user.new_password }} (<a href="#" class="generate_password">{{ lang.user.generate }}</a>)</label>
<form class="form-horizontal" data-cached-form="false" data-id="tempaliascreate" role="form" method="post" autocomplete="off">
<div class="row mb-4">
<label class="control-label col-sm-3" for="description">{{ lang.user.description }}</label>
<div class="col-sm-5">
<input type="password" data-pwgen-field="true" data-hibp="true" class="form-control" name="user_new_pass" autocomplete="new-password" required>
</div>
</div>
<div class="row">
<label class="control-label col-sm-3" for="user_new_pass2">{{ lang.user.new_password_repeat }}</label>
<div class="col-sm-5">
<input type="password" data-pwgen-field="true" class="form-control" name="user_new_pass2" autocomplete="new-password" required>
<p class="text-muted">{{ lang.user.new_password_description }}</p>
</div>
</div>
<hr>
<div class="row">
<label class="control-label col-sm-3" for="user_old_pass">{{ lang.user.password_now }}</label>
<div class="col-sm-5">
<input type="password" class="form-control" name="user_old_pass" autocomplete="off" required>
<input type="hidden" id="temp_alias_domain" name="domain">
<input type="description" id="temp_alias_description" class="form-control" name="description" autocomplete="off">
</div>
</div>
<div class="row">
<div class="offset-sm-3 col-sm-9">
<button class="btn btn-xs-lg d-block d-sm-inline btn-success" data-action="edit_selected" data-id="pwchange" data-item="null" data-api-url='edit/self' data-api-attr='{}' href="#">{{ lang.user.change_password }}</button>
<button class="btn btn-xs-lg d-block d-sm-inline btn-success" data-action="add_item" data-id="tempaliascreate" data-item="null" data-api-url='add/time_limited_alias' data-api-attr='' href="#">{{ lang.admin.add }}</button>
</div>
</div>
</form>

2
data/web/templates/user/SpamAliases.twig
View File

@ -33,7 +33,7 @@
<ul class="dropdown-menu">
{% for domain in user_domains %}
<li>
<a class="dropdown-item" data-action="add_item" data-api-url='add/time_limited_alias' data-api-attr='{"domain":"{{ domain }}"}' href="#">
<a class="dropdown-item" data-bs-toggle="modal" data-bs-target="#tempAliasModal" onclick='$("#tempAliasModal #temp_alias_domain").val("{{ domain }}")' href="#">
@ {{ domain }}
</a>
</li>