Merge pull request #6001 from marekfilip/feat/temp-email-aliases

add temporary email description
2025-12-13 18:06:01 +00:00 · 2025-01-14 11:52:44 +01:00
parent d280025b51 150b2bbd9d
commit 24b3d8f850
29 changed files with 99 additions and 80 deletions
--- a/data/web/inc/functions.mailbox.inc.php
+++ b/data/web/inc/functions.mailbox.inc.php
@@ -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`
--- a/data/web/inc/init_db.inc.php
+++ b/data/web/inc/init_db.inc.php
@@ -1,5 +1,6 @@
 <?php
-function init_db_schema() {
+function init_db_schema()
+{
  try {
    global $pdo;

@@ -488,7 +489,7 @@ function init_db_schema() {
          "quarantine_category" => "TINYINT(1) NOT NULL DEFAULT '1'",
          "app_passwds" => "TINYINT(1) NOT NULL DEFAULT '1'",
          "pw_reset" => "TINYINT(1) NOT NULL DEFAULT '1'",
-          ),
+        ),
        "keys" => array(
          "primary" => array(
            "" => array("username")
@@ -527,6 +528,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)"
@@ -678,7 +680,7 @@ function init_db_schema() {
          "mailbox_relayhost" => "TINYINT(1) NOT NULL DEFAULT '1'",
          "domain_relayhost" => "TINYINT(1) NOT NULL DEFAULT '1'",
          "domain_desc" => "TINYINT(1) NOT NULL DEFAULT '0'"
-          ),
+        ),
        "keys" => array(
          "primary" => array(
            "" => array("username")
@@ -1151,7 +1153,7 @@ function init_db_schema() {
        while ($row = array_shift($rows)) {
          $pdo->query($row['FKEY_DROP']);
        }
-        foreach($properties['cols'] as $column => $type) {
+        foreach ($properties['cols'] as $column => $type) {
          $stmt = $pdo->query("SHOW COLUMNS FROM `" . $table . "` LIKE '" . $column . "'");
          $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC));
          if ($num_results == 0) {
@@ -1165,12 +1167,11 @@ function init_db_schema() {
              }
            }
            $pdo->query("ALTER TABLE `" . $table . "` ADD `" . $column . "` " . $type);
-          }
-          else {
+          } else {
            $pdo->query("ALTER TABLE `" . $table . "` MODIFY COLUMN `" . $column . "` " . $type);
          }
        }
-        foreach($properties['keys'] as $key_type => $key_content) {
+        foreach ($properties['keys'] as $key_type => $key_content) {
          if (strtolower($key_type) == 'primary') {
            foreach ($key_content as $key_values) {
              $fields = "`" . implode("`, `", $key_values) . "`";
@@ -1227,18 +1228,18 @@ function init_db_schema() {
        $keys_to_exist = array();
        if (isset($properties['keys']['unique']) && is_array($properties['keys']['unique'])) {
          foreach ($properties['keys']['unique'] as $key_name => $key_values) {
-             $keys_to_exist[] = $key_name;
+            $keys_to_exist[] = $key_name;
          }
        }
        if (isset($properties['keys']['key']) && is_array($properties['keys']['key'])) {
          foreach ($properties['keys']['key'] as $key_name => $key_values) {
-             $keys_to_exist[] = $key_name;
+            $keys_to_exist[] = $key_name;
          }
        }
        // Index for foreign key must exist
        if (isset($properties['keys']['fkey']) && is_array($properties['keys']['fkey'])) {
          foreach ($properties['keys']['fkey'] as $key_name => $key_values) {
-             $keys_to_exist[] = $key_name;
+            $keys_to_exist[] = $key_name;
          }
        }
        // Step 2: Drop all vanished indexes
@@ -1255,33 +1256,29 @@ function init_db_schema() {
            $pdo->query("ALTER TABLE `" . $table . "` DROP PRIMARY KEY");
          }
        }
-      }
-      else {
+      } else {
        // Create table if it is missing
        $sql = "CREATE TABLE IF NOT EXISTS `" . $table . "` (";
-        foreach($properties['cols'] as $column => $type) {
+        foreach ($properties['cols'] as $column => $type) {
          $sql .= "`" . $column . "` " . $type . ",";
        }
-        foreach($properties['keys'] as $key_type => $key_content) {
+        foreach ($properties['keys'] as $key_type => $key_content) {
          if (strtolower($key_type) == 'primary') {
            foreach ($key_content as $key_values) {
              $fields = "`" . implode("`, `", $key_values) . "`";
              $sql .= "PRIMARY KEY (" . $fields . ")" . ",";
            }
-          }
-          elseif (strtolower($key_type) == 'key') {
+          } elseif (strtolower($key_type) == 'key') {
            foreach ($key_content as $key_name => $key_values) {
              $fields = "`" . implode("`, `", $key_values) . "`";
              $sql .= "KEY `" . $key_name . "` (" . $fields . ")" . ",";
            }
-          }
-          elseif (strtolower($key_type) == 'unique') {
+          } elseif (strtolower($key_type) == 'unique') {
            foreach ($key_content as $key_name => $key_values) {
              $fields = "`" . implode("`, `", $key_values) . "`";
              $sql .= "UNIQUE KEY `" . $key_name . "` (" . $fields . ")" . ",";
            }
-          }
-          elseif (strtolower($key_type) == 'fkey') {
+          } elseif (strtolower($key_type) == 'fkey') {
            foreach ($key_content as $key_name => $key_values) {
              @list($table_ref, $field_ref) = explode('.', $key_values['ref']);
              $sql .= "FOREIGN KEY `" . $key_name . "` (" . $key_values['col'] . ") REFERENCES `" . $table_ref . "` (`" . $field_ref . "`)
@@ -1295,7 +1292,6 @@ function init_db_schema() {
      }
      // Reset table attributes
      $pdo->query("ALTER TABLE `" . $table . "` " . $properties['attr'] . ";");
-
    }

    // Recreate SQL views
@@ -1322,12 +1318,12 @@ function init_db_schema() {
    $stmt = $pdo->query("SELECT NULL FROM `admin`");
    $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC));
    if ($num_results == 0) {
-    $pdo->query("INSERT INTO `admin` (`username`, `password`, `superadmin`, `created`, `modified`, `active`)
+      $pdo->query("INSERT INTO `admin` (`username`, `password`, `superadmin`, `created`, `modified`, `active`)
      VALUES ('admin', '{SSHA256}K8eVJ6YsZbQCfuJvSUbaQRLr0HPLz5rC9IAp0PAFl0tmNDBkMDc0NDAyOTAxN2Rk', 1, NOW(), NOW(), 1)");
-    $pdo->query("INSERT INTO `domain_admins` (`username`, `domain`, `created`, `active`)
+      $pdo->query("INSERT INTO `domain_admins` (`username`, `domain`, `created`, `active`)
        SELECT `username`, 'ALL', NOW(), 1 FROM `admin`
          WHERE superadmin='1' AND `username` NOT IN (SELECT `username` FROM `domain_admins`);");
-    $pdo->query("DELETE FROM `admin` WHERE `username` NOT IN  (SELECT `username` FROM `domain_admins`);");
+      $pdo->query("DELETE FROM `admin` WHERE `username` NOT IN  (SELECT `username` FROM `domain_admins`);");
    }
    // Insert new DB schema version
    $pdo->query("REPLACE INTO `versions` (`application`, `version`) VALUES ('db_schema', '" . $db_version . "');");
@@ -1355,7 +1351,7 @@ function init_db_schema() {
    $pdo->query("UPDATE `mailbox` SET `attributes` =  JSON_SET(`attributes`, '$.mailbox_format', \"maildir:\") WHERE JSON_VALUE(`attributes`, '$.mailbox_format') IS NULL;");
    $pdo->query("UPDATE `mailbox` SET `attributes` =  JSON_SET(`attributes`, '$.quarantine_notification', \"never\") WHERE JSON_VALUE(`attributes`, '$.quarantine_notification') IS NULL;");
    $pdo->query("UPDATE `mailbox` SET `attributes` =  JSON_SET(`attributes`, '$.quarantine_category', \"reject\") WHERE JSON_VALUE(`attributes`, '$.quarantine_category') IS NULL;");
-    foreach($tls_options as $tls_user => $tls_options) {
+    foreach ($tls_options as $tls_user => $tls_options) {
      $stmt = $pdo->prepare("UPDATE `mailbox` SET `attributes` = JSON_SET(`attributes`, '$.tls_enforce_in', :tls_enforce_in),
        `attributes` = JSON_SET(`attributes`, '$.tls_enforce_out', :tls_enforce_out)
          WHERE `username` = :username");
@@ -1434,7 +1430,7 @@ function init_db_schema() {
      ":template" => $default_domain_template["template"]
    ));
    $row = $stmt->fetch(PDO::FETCH_ASSOC);
-    if (empty($row)){
+    if (empty($row)) {
      $stmt = $pdo->prepare("INSERT INTO `templates` (`type`, `template`, `attributes`)
        VALUES (:type, :template, :attributes)");
      $stmt->execute(array(
@@ -1449,7 +1445,7 @@ function init_db_schema() {
      ":template" => $default_mailbox_template["template"]
    ));
    $row = $stmt->fetch(PDO::FETCH_ASSOC);
-    if (empty($row)){
+    if (empty($row)) {
      $stmt = $pdo->prepare("INSERT INTO `templates` (`type`, `template`, `attributes`)
        VALUES (:type, :template, :attributes)");
      $stmt->execute(array(
@@ -1468,8 +1464,7 @@ function init_db_schema() {
        'msg' => 'db_init_complete'
      );
    }
-  }
-  catch (PDOException $e) {
+  } catch (PDOException $e) {
    if (php_sapi_name() == "cli") {
      echo "DB initialization failed: " . print_r($e, true) . PHP_EOL;
    } else {
@@ -1508,8 +1503,7 @@ if (php_sapi_name() == "cli") {
        SELECT `c_uid`, `domain`, `c_name`, `c_password`, `c_cn`, `mail`, `aliases`, `ad_aliases`, `ext_acl`, `kind`, `multiple_bookings` from sogo_view");
      $stmt = $pdo->query("DELETE FROM _sogo_static_view WHERE `c_uid` NOT IN (SELECT `username` FROM `mailbox` WHERE `active` = '1');");
      echo "Fixed _sogo_static_view" . PHP_EOL;
-    }
-    catch ( Exception $e ) {
+    } catch (Exception $e) {
      // Dunno
    }
  }
@@ -1517,9 +1511,8 @@ if (php_sapi_name() == "cli") {
    $m = new Memcached();
    $m->addServer('memcached', 11211);
    $m->flush();
-    echo "Cleaned up memcached". PHP_EOL;
-  }
-  catch ( Exception $e ) {
+    echo "Cleaned up memcached" . PHP_EOL;
+  } catch (Exception $e) {
    // Dunno
  }
  init_db_schema();
--- a/data/web/js/site/user.js
+++ b/data/web/js/site/user.js
@@ -202,6 +202,14 @@ jQuery(function($){
          data: 'address',
          defaultContent: ''
        },
+        {
+          title: lang.description,
+          data: 'description',
+          defaultContent: '',
+          render: function (data, type) {
+            return escapeHtml(data);
+          }
+        },
        {
          title: lang.alias_valid_until,
          data: 'validity',
--- a/data/web/lang/lang.ca-es.json
+++ b/data/web/lang/lang.ca-es.json
@@ -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",
--- a/data/web/lang/lang.cs-cz.json
+++ b/data/web/lang/lang.cs-cz.json
@@ -1161,6 +1161,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",
--- a/data/web/lang/lang.da-dk.json
+++ b/data/web/lang/lang.da-dk.json
@@ -968,6 +968,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.",
--- a/data/web/lang/lang.de-de.json
+++ b/data/web/lang/lang.de-de.json
@@ -1182,6 +1182,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.",
--- a/data/web/lang/lang.en-gb.json
+++ b/data/web/lang/lang.en-gb.json
@@ -1189,6 +1189,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.",
--- a/data/web/lang/lang.es-es.json
+++ b/data/web/lang/lang.es-es.json
@@ -707,6 +707,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",
--- a/data/web/lang/lang.fi-fi.json
+++ b/data/web/lang/lang.fi-fi.json
@@ -807,6 +807,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",
--- a/data/web/lang/lang.fr-fr.json
+++ b/data/web/lang/lang.fr-fr.json
@@ -1150,6 +1150,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 d'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.",
--- a/data/web/lang/lang.hu-hu.json
+++ b/data/web/lang/lang.hu-hu.json
@@ -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",
--- a/data/web/lang/lang.it-it.json
+++ b/data/web/lang/lang.it-it.json
@@ -1123,6 +1123,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.",
--- a/data/web/lang/lang.ko-kr.json
+++ b/data/web/lang/lang.ko-kr.json
@@ -908,6 +908,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.",
--- a/data/web/lang/lang.lv-lv.json
+++ b/data/web/lang/lang.lv-lv.json
@@ -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",
--- a/data/web/lang/lang.nl-nl.json
+++ b/data/web/lang/lang.nl-nl.json
@@ -1025,6 +1025,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.",
--- a/data/web/lang/lang.pl-pl.json
+++ b/data/web/lang/lang.pl-pl.json
@@ -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",
--- a/data/web/lang/lang.pt-br.json
+++ b/data/web/lang/lang.pt-br.json
@@ -1183,6 +1183,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.",
--- a/data/web/lang/lang.pt-pt.json
+++ b/data/web/lang/lang.pt-pt.json
@@ -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",
--- a/data/web/lang/lang.ro-ro.json
+++ b/data/web/lang/lang.ro-ro.json
@@ -1061,6 +1061,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.",
--- a/data/web/lang/lang.ru-ru.json
+++ b/data/web/lang/lang.ru-ru.json
@@ -1189,6 +1189,7 @@
        "created_on": "Дата создания",
        "daily": "Раз в день",
        "day": "день",
+        "description": "Описание",
        "delete_ays": "Пожалуйста, подтвердите удаление",
        "direct_aliases": "Личные псевдонимы",
        "direct_aliases_desc": "На личные псевдонимы распространяются фильтры нежелательной почты и параметры политики TLS.",
--- a/data/web/lang/lang.sk-sk.json
+++ b/data/web/lang/lang.sk-sk.json
@@ -1113,6 +1113,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.",
--- a/data/web/lang/lang.sv-se.json
+++ b/data/web/lang/lang.sv-se.json
@@ -990,6 +990,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.",
--- a/data/web/lang/lang.tr-tr.json
+++ b/data/web/lang/lang.tr-tr.json
@@ -1204,6 +1204,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!",
--- a/data/web/lang/lang.uk-ua.json
+++ b/data/web/lang/lang.uk-ua.json
@@ -1132,6 +1132,7 @@
        "created_on": "Дата створення",
        "daily": "Раз на день",
        "day": "день",
+        "description": "Опис",
        "delete_ays": "Будь ласка, підтвердіть видалення.",
        "eas_reset": "Скинути кеш ActiveSync пристроїв",
        "eas_reset_help": "У багатьох випадках скидання кешу пристроїв допомагає відновити пошкоджений профіль ActiveSync.<br><b>Увага:</b> всі листи, календарі та контакти будуть завантажені заново на всі ваші пристрої!",
--- a/data/web/lang/lang.zh-cn.json
+++ b/data/web/lang/lang.zh-cn.json
@@ -1161,6 +1161,7 @@
        "created_on": "添加于",
        "daily": "每日",
        "day": "日",
+        "description": "描述",
        "delete_ays": "请确认删除。",
        "direct_aliases": "直接别名",
        "direct_aliases_desc": "垃圾邮件过滤和 TLS 策略会作用于直接别名。",
--- a/data/web/lang/lang.zh-tw.json
+++ b/data/web/lang/lang.zh-tw.json
@@ -1137,6 +1137,7 @@
        "created_on": "建立於",
        "daily": "每日",
        "day": "日",
+        "description": "描述",
        "delete_ays": "請確認刪除。",
        "direct_aliases": "直接別名",
        "direct_aliases_desc": "直接別名會受到垃圾郵件過濾器和 TLS 規則限制。",
--- a/data/web/templates/modals/user.twig
+++ b/data/web/templates/modals/user.twig
@@ -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>
--- a/data/web/templates/user/SpamAliases.twig
+++ b/data/web/templates/user/SpamAliases.twig
@@ -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>