diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 03fee667..7ed39d34 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -9,6 +9,7 @@ Changes in 'master' (not in a release yet) (20XX/XX/XX) -------------------------- + - Distinguish unknown local alias destinations from external destinations without inspecting other administrators' domains (see discussion #886, thanks @TrapoSAMA) - Show available usage for unlimited quotas and retain neutral quota boxes. - Remove the obsolete quota_usage.pl example and Horde 3 SQL password guide. See ADDITIONS/README.md for quota integration and modernization notes. diff --git a/config.inc.php b/config.inc.php index 113d74c7..780e8630 100644 --- a/config.inc.php +++ b/config.inc.php @@ -614,11 +614,12 @@ $CONF['show_status_key']='YES'; // 'show_status_text' will be displayed with the background colors // associated with each status, you can customize it here $CONF['show_status_text']='  '; -// show_undeliverable is useful if most accounts are delivered to this -// postfix system. If many aliases and mailboxes are forwarded -// elsewhere, you will probably want to disable this. +// Highlight undeliverable destinations in locally managed domains. +// This checks PostfixAdmin records, not actual mail delivery. $CONF['show_undeliverable']='YES'; $CONF['show_undeliverable_color']='tomato'; +// Destinations outside the administrator's managed domains (no existence check). +$CONF['show_external_color']='lightblue'; // mails to these domains will never be flagged as undeliverable $CONF['show_undeliverable_exceptions']=array("unixmail.domain.ext","exchangeserver.domain.ext"); // show mailboxes with expired password; requires password_expiration to be enabled @@ -636,8 +637,11 @@ $CONF['show_popimap_color']='darkgrey'; // you can assign special colors to some domains. To do this, // - add the domain to show_custom_domains // - add the corresponding color to show_custom_colors -$CONF['show_custom_domains']=array("subdomain.domain.ext","domain2.ext"); -$CONF['show_custom_colors']=array("lightgreen","lightblue"); +// Example: +// $CONF['show_custom_domains']=array("subdomain.domain.ext","domain2.ext"); +// $CONF['show_custom_colors']=array("lightgreen","lightblue"); +$CONF['show_custom_domains']=array(); +$CONF['show_custom_colors']=array(); // If you use a recipient_delimiter in your postfix config, you can also honor it when aliases are checked. // Example: $CONF['recipient_delimiter'] = "+"; // Set to "" to disable this check. diff --git a/functions.inc.php b/functions.inc.php index 7cb017ca..602e740a 100644 --- a/functions.inc.php +++ b/functions.inc.php @@ -2381,9 +2381,10 @@ function check_db_version($error_out = true) * addresses list in show_custom_domains * * @param string $show_alias + * @param array $allowed_domains Domains authorized for the caller. Domains not listed here are marked as external. * @return string */ -function gen_show_status($show_alias) +function gen_show_status($show_alias, array $allowed_domains) { global $CONF; $table_alias = table_by_key('alias'); @@ -2403,47 +2404,55 @@ function gen_show_status($show_alias) $delimiter_regex = '/' . $delimiter . '[^' . $delimiter . '@]*@/'; } - // UNDELIVERABLE CHECK + // Only inspect destination records within the caller's authorized domains. if ($CONF['show_undeliverable'] == 'YES') { - $gotos = explode(',', $stat_goto); - - //make sure this alias goes somewhere known - $stat_ok = 1; - foreach ($gotos as $g) { - if (!$stat_ok) { - break; + $destination_status = ['undeliverable' => false, 'external' => false]; + foreach (explode(',', $stat_goto) as $destination) { + $destination = trim($destination); + if (strpos($destination, '@') === false) { + continue; } - if (strpos($g, '@') === false) { + [$local_part, $domain] = explode('@', $destination, 2); + if ($domain == $CONF['vacation_domain'] || in_array($domain, $CONF['show_undeliverable_exceptions'])) { + continue; + } + if (!in_array($domain, $allowed_domains, true)) { + $destination_status['external'] = true; continue; } - list($_, $stat_domain) = explode('@', $g); - + $alias_domain = db_query_one( + 'SELECT target_domain FROM ' . table_by_key('alias_domain') . ' WHERE alias_domain = ? AND active = ?', + [$domain, true] + ); + if ($alias_domain) { + $domain = $alias_domain['target_domain']; + if (!in_array($domain, $allowed_domains, true)) { + $destination_status['external'] = true; + continue; + } + $destination = $local_part . '@' . $domain; + } $sql = "SELECT address FROM $table_alias WHERE address = ? OR address = ?"; - $v = [$g, '@' . $stat_domain]; - - if (!empty($CONF['recipient_delimiter']) && isset($delimiter_regex)) { - $v[] = preg_replace($delimiter_regex, "@", $g); - $sql .= " OR address = ? "; + $values = [$destination, '@' . $domain]; + if ($delimiter_regex !== null) { + $sql .= ' OR address = ?'; + $values[] = preg_replace($delimiter_regex, '@', $destination); } - - $stat_result = db_query_one($sql, $v); - - if (empty($stat_result)) { - $stat_ok = 0; + if (!db_query_one($sql, $values)) { + $destination_status['undeliverable'] = true; } - - if ($stat_ok == 0) { - if ($stat_domain == $CONF['vacation_domain'] || in_array($stat_domain, $CONF['show_undeliverable_exceptions'])) { - $stat_ok = 1; - } + } + foreach ($destination_status as $status => $present) { + if ($present) { + $tooltip = htmlspecialchars(Config::lang('pStatus_' . $status . '_tooltip'), ENT_QUOTES, 'UTF-8'); + $color = htmlspecialchars($CONF['show_' . $status . '_color'], ENT_QUOTES, 'UTF-8'); + $stat_string .= "" . + $CONF['show_status_text'] . ' '; + } else { + $stat_string .= $CONF['show_status_text'] . ' '; } - } // while - if ($stat_ok == 0) { - $stat_string .= "" . $CONF['show_status_text'] . " "; - } else { - $stat_string .= $CONF['show_status_text'] . " "; } } diff --git a/languages/bg.lang b/languages/bg.lang index bf29e1f7..67b91101 100644 --- a/languages/bg.lang +++ b/languages/bg.lang @@ -415,7 +415,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Съобщение до всички' $PALANG['pBroadcast_error_empty'] = 'Полетата Име, Заглавие и Съобщение са задължителни!'; $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX +$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/ca.lang b/languages/ca.lang index 7f392887..bc43842f 100644 --- a/languages/ca.lang +++ b/languages/ca.lang @@ -414,7 +414,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX +$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/cn.lang b/languages/cn.lang index 7429a2c3..3820d76f 100644 --- a/languages/cn.lang +++ b/languages/cn.lang @@ -414,7 +414,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX +$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/cs.lang b/languages/cs.lang index f0f674f5..3aeb8109 100644 --- a/languages/cs.lang +++ b/languages/cs.lang @@ -428,7 +428,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Poslat email všem'; $PALANG['pBroadcast_error_empty'] = 'Pole Od, Předmět a Zpráva by neměly být prázdné!'; $PALANG['broadcast_mailboxes_only'] = 'Pouze poslat do schránek'; $PALANG['broadcast_to_domains'] = 'Poslat na domény:'; -$PALANG['pStatus_undeliverable'] = 'možná NEDORUČITELNÉ '; +$PALANG['pStatus_undeliverable'] = 'možná NEDORUČITELNÉ '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Účet pozastaven '; $PALANG['pStatus_expired'] = 'Heslo expirováno '; $PALANG['pStatus_vacation'] = 'Aktivní mód dovolené '; diff --git a/languages/da.lang b/languages/da.lang index b4fe9f5d..3d949b95 100644 --- a/languages/da.lang +++ b/languages/da.lang @@ -426,7 +426,10 @@ $PALANG['pBroadcast_error_empty'] = 'Felterne "Dit navn", "Emne" og "Medde $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = 'kan måske ikke leveres '; +$PALANG['pStatus_undeliverable'] = 'kan måske ikke leveres '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/de.lang b/languages/de.lang index 72539818..b71f6dc4 100644 --- a/languages/de.lang +++ b/languages/de.lang @@ -424,7 +424,10 @@ $PALANG['pBroadcast_error_empty'] = 'Die Felder Name, Betreff und Nachricht dür $PALANG['broadcast_mailboxes_only'] = "Nur an Postfächer senden"; $PALANG['broadcast_to_domains'] = "Senden an Domains:"; -$PALANG['pStatus_undeliverable'] = 'möglicherweise UNZUSTELLBAR '; +$PALANG['pStatus_undeliverable'] = 'möglicherweise UNZUSTELLBAR '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Konto deaktiviert '; $PALANG['pStatus_expired'] = 'Passwort abgelaufen '; $PALANG['pStatus_vacation'] = 'Automatische Antwort aktiviert '; diff --git a/languages/en.lang b/languages/en.lang index 5b14fc86..772a82f3 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -490,7 +490,10 @@ $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; $PALANG['broadcast_to_domains'] = 'Send to domains:'; -$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; +$PALANG['pStatus_undeliverable'] = 'Undeliverable local destination'; +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; +$PALANG['pStatus_external'] = 'External destination'; +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; $PALANG['pStatus_disabled'] = 'Account disabled '; $PALANG['pStatus_expired'] = 'Password expired '; $PALANG['pStatus_vacation'] = 'Vacation enabled '; diff --git a/languages/es.lang b/languages/es.lang index 0b09f6fb..42300770 100644 --- a/languages/es.lang +++ b/languages/es.lang @@ -415,7 +415,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Mensajería GLOBAL'; $PALANG['pBroadcast_error_empty'] = '¡Los campos Nombre, Asunto y Mensaje no pueden estar vacíos!'; $PALANG['broadcast_mailboxes_only'] = 'Envíar solo a los buzones'; $PALANG['broadcast_to_domains'] = 'Envíar a los dominios:'; -$PALANG['pStatus_undeliverable'] = 'posiblemente NO SE ENTREGÓ'; +$PALANG['pStatus_undeliverable'] = 'Destino local no entregable'; +$PALANG['pStatus_undeliverable_tooltip'] = 'No figura como destino local.'; +$PALANG['pStatus_external'] = 'Destino externo'; +$PALANG['pStatus_external_tooltip'] = 'Fuera de tus dominios administrados.'; $PALANG['pStatus_disabled'] = 'Cuenta desactivada '; $PALANG['pStatus_expired'] = 'Contraseña vencida '; $PALANG['pStatus_vacation'] = 'Mensaje de vacaciones activado '; diff --git a/languages/et.lang b/languages/et.lang index 7da5e670..9d24f6a0 100644 --- a/languages/et.lang +++ b/languages/et.lang @@ -418,7 +418,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX +$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/eu.lang b/languages/eu.lang index 8e14a98f..46e7a3aa 100644 --- a/languages/eu.lang +++ b/languages/eu.lang @@ -413,7 +413,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX +$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/fi.lang b/languages/fi.lang index 2ff624cb..9a5c6c3f 100644 --- a/languages/fi.lang +++ b/languages/fi.lang @@ -414,7 +414,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Tiedotusviesti'; $PALANG['pBroadcast_error_empty'] = 'Nimi, Aihe tai Viesti kenttien ei pidä olla tyhjiä!'; $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = 'ehkä ei voida toimittaa '; +$PALANG['pStatus_undeliverable'] = 'ehkä ei voida toimittaa '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/fo.lang b/languages/fo.lang index df0f272e..9208546d 100644 --- a/languages/fo.lang +++ b/languages/fo.lang @@ -419,7 +419,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX +$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/fr.lang b/languages/fr.lang index 52d73441..285d78fc 100644 --- a/languages/fr.lang +++ b/languages/fr.lang @@ -419,7 +419,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Message général'; $PALANG['pBroadcast_error_empty'] = 'Les champs "Nom", "Sujet" et "Message" ne peuvent pas être vides !'; $PALANG['broadcast_mailboxes_only'] = 'Envoyer seulement aux comptes courriel'; $PALANG['broadcast_to_domains'] = 'Envoyer aux domaines:'; -$PALANG['pStatus_undeliverable'] = 'Non délivrable '; +$PALANG['pStatus_undeliverable'] = 'Non délivrable '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Compte désactivé '; $PALANG['pStatus_expired'] = 'Mot de passe expiré '; $PALANG['pStatus_vacation'] = 'Répondeur activé '; diff --git a/languages/gl.lang b/languages/gl.lang index 4782a5d7..a3519d73 100644 --- a/languages/gl.lang +++ b/languages/gl.lang @@ -414,7 +414,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Mensaxe de Broadcast'; # XXX $PALANG['pBroadcast_error_empty'] = 'Os campos Nome, Asunto e Mensaxe non poden estar baleiros!'; $PALANG['broadcast_mailboxes_only'] = 'Só enviar a buzóns'; # XXX $PALANG['broadcast_to_domains'] = 'Enviar a dominios:'; # XXX -$PALANG['pStatus_undeliverable'] = 'posiblemente NON SE ENTREGOU'; +$PALANG['pStatus_undeliverable'] = 'posiblemente NON SE ENTREGOU'; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Conta desabilitada '; # XXX $PALANG['pStatus_expired'] = 'Contrasinal vencido '; # XXX $PALANG['pStatus_vacation'] = 'Ausencia activada '; # XXX diff --git a/languages/hr.lang b/languages/hr.lang index 82fc82b2..36b0b142 100644 --- a/languages/hr.lang +++ b/languages/hr.lang @@ -412,7 +412,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX +$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/hu.lang b/languages/hu.lang index 08599b30..bf4dcc74 100644 --- a/languages/hu.lang +++ b/languages/hu.lang @@ -425,7 +425,10 @@ $PALANG['pBroadcast_error_empty'] = 'A név, téma és üzenet mezők nem lehetn $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = 'lehet hogy nem kézbesíthető '; +$PALANG['pStatus_undeliverable'] = 'lehet hogy nem kézbesíthető '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/is.lang b/languages/is.lang index 47517be2..95f492d5 100644 --- a/languages/is.lang +++ b/languages/is.lang @@ -414,7 +414,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX +$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/it.lang b/languages/it.lang index 5457ceb4..f4a3d065 100644 --- a/languages/it.lang +++ b/languages/it.lang @@ -415,7 +415,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Invio di gruppo'; $PALANG['pBroadcast_error_empty'] = 'Nome, oggetto e testo del messaggio non possono restare vuoti!'; $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = 'presumibilmente NON CONSEGNABILE '; +$PALANG['pStatus_undeliverable'] = 'presumibilmente NON CONSEGNABILE '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/ja.lang b/languages/ja.lang index 9c81d954..4d5229ed 100644 --- a/languages/ja.lang +++ b/languages/ja.lang @@ -423,7 +423,10 @@ $PALANG['pBroadcast_error_empty'] = '名前、件名、メッセージは入力 $PALANG['broadcast_mailboxes_only'] = 'メールアドレスだけに送信'; $PALANG['broadcast_to_domains'] = '送信先のドメイン:'; -$PALANG['pStatus_undeliverable'] = 'おそらく配送不可能 '; +$PALANG['pStatus_undeliverable'] = 'おそらく配送不可能 '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/ko.lang b/languages/ko.lang index bc419657..577a37f6 100644 --- a/languages/ko.lang +++ b/languages/ko.lang @@ -487,7 +487,10 @@ $PALANG['pBroadcast_error_empty'] = '이름, 제목, 메시지 항목은 비워 $PALANG['broadcast_mailboxes_only'] = '메일박스 계정에만 발송'; $PALANG['broadcast_to_domains'] = '발송 대상 도메인:'; -$PALANG['pStatus_undeliverable'] = '전달 불가 가능성 높음 '; +$PALANG['pStatus_undeliverable'] = '전달 불가 가능성 높음 '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = '계정 비활성화됨 '; $PALANG['pStatus_expired'] = '비밀번호 만료됨 '; $PALANG['pStatus_vacation'] = '부재중 응답 켜짐 '; diff --git a/languages/lt.lang b/languages/lt.lang index 93ac2e59..803b9b7f 100644 --- a/languages/lt.lang +++ b/languages/lt.lang @@ -420,7 +420,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX +$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/mk.lang b/languages/mk.lang index a6aed467..0f09c0aa 100644 --- a/languages/mk.lang +++ b/languages/mk.lang @@ -415,7 +415,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX +$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/nb.lang b/languages/nb.lang index ca1c8f1a..cb276077 100644 --- a/languages/nb.lang +++ b/languages/nb.lang @@ -414,7 +414,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Send masseutsendelse'; $PALANG['pBroadcast_error_empty'] = 'Feltene Ditt navn, Emne og Melding kan ikke være tomme!'; $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = 'kan kanskje IKKE LEVERES '; +$PALANG['pStatus_undeliverable'] = 'kan kanskje IKKE LEVERES '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/nl.lang b/languages/nl.lang index e7e5d8c8..ceaef16e 100644 --- a/languages/nl.lang +++ b/languages/nl.lang @@ -416,7 +416,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Algemeen bericht'; $PALANG['pBroadcast_error_empty'] = 'De velden Naam, Onderwerp en Bericht mogen niet leeg zijn !'; $PALANG['broadcast_mailboxes_only'] = 'Verstuur alleen aan mailboxen'; $PALANG['broadcast_to_domains'] = 'Verstuur aan de domeinen:'; -$PALANG['pStatus_undeliverable'] = 'Misschien niet af te leveren '; +$PALANG['pStatus_undeliverable'] = 'Misschien niet af te leveren '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account uitgeschakeld '; $PALANG['pStatus_expired'] = 'Wachwoord is verlopen '; $PALANG['pStatus_vacation'] = 'Vakatie toegestaan '; diff --git a/languages/nn.lang b/languages/nn.lang index 9e87b474..53c31455 100644 --- a/languages/nn.lang +++ b/languages/nn.lang @@ -413,7 +413,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX +$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/pl.lang b/languages/pl.lang index 249ed4df..39b10ead 100644 --- a/languages/pl.lang +++ b/languages/pl.lang @@ -420,7 +420,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Wiadomość do wszystkich'; $PALANG['pBroadcast_error_empty'] = 'Pola Nazwa, Temat i Wiadomość nie powinny być puste !'; $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = 'może być NIEDOSTARCZALNA '; +$PALANG['pStatus_undeliverable'] = 'może być NIEDOSTARCZALNA '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/pt-br.lang b/languages/pt-br.lang index 3507ce0e..d167685c 100644 --- a/languages/pt-br.lang +++ b/languages/pt-br.lang @@ -425,7 +425,10 @@ $PALANG['pBroadcast_error_empty'] = 'Os campos Nome, Assunto e Mensagem devem se $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = 'talvez NÃO-ENTREGÁVEL '; +$PALANG['pStatus_undeliverable'] = 'talvez NÃO-ENTREGÁVEL '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/pt-pt.lang b/languages/pt-pt.lang index 769cf335..dcd8a27e 100644 --- a/languages/pt-pt.lang +++ b/languages/pt-pt.lang @@ -425,7 +425,10 @@ $PALANG['pBroadcast_error_empty'] = 'Os campos Nome, Assunto e Mensagem devem se $PALANG['broadcast_mailboxes_only'] = 'Apenas envia para mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Enviar para os domínios:'; # XXX -$PALANG['pStatus_undeliverable'] = 'talvez NÃO-ENTREGÁVEL '; +$PALANG['pStatus_undeliverable'] = 'talvez NÃO-ENTREGÁVEL '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Conta desctivada '; # XXX $PALANG['pStatus_expired'] = 'Password expirada '; # XXX $PALANG['pStatus_vacation'] = 'Férias activadas '; # XXX diff --git a/languages/ro.lang b/languages/ro.lang index 59a383ef..eaca81fb 100644 --- a/languages/ro.lang +++ b/languages/ro.lang @@ -423,7 +423,10 @@ $PALANG['pBroadcast_error_empty'] = 'Campurile Nume, Subiect si Mesaj nu pot fi $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = 'probabil UNDELIVERABLE '; +$PALANG['pStatus_undeliverable'] = 'probabil UNDELIVERABLE '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/ru.lang b/languages/ru.lang index f2a69184..8ad8a11e 100644 --- a/languages/ru.lang +++ b/languages/ru.lang @@ -426,7 +426,10 @@ $PALANG['pBroadcast_error_empty'] = 'Поля Имя, Тема и Сообщен $PALANG['broadcast_mailboxes_only'] = 'Отправить только на почтовые ящики'; $PALANG['broadcast_to_domains'] = 'Отправить на домены:'; -$PALANG['pStatus_undeliverable'] = 'возможно НЕ ДОСТАВЛЕНО '; +$PALANG['pStatus_undeliverable'] = 'возможно НЕ ДОСТАВЛЕНО '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Учетная запись отключена '; $PALANG['pStatus_expired'] = 'Срок действия пароля истек '; $PALANG['pStatus_vacation'] = 'Автоответчик включен '; diff --git a/languages/sk.lang b/languages/sk.lang index 1c9dd4d2..1085dc9a 100644 --- a/languages/sk.lang +++ b/languages/sk.lang @@ -415,7 +415,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Hromadná správa'; $PALANG['pBroadcast_error_empty'] = 'Polia Vaše meno, Predmet a Obsah nemôžu byť prázdne!'; $PALANG['broadcast_mailboxes_only'] = 'Posielať len do schránok'; $PALANG['broadcast_to_domains'] = 'Posielať na domény:'; -$PALANG['pStatus_undeliverable'] = 'možno NEDORUČITEĽNÉ '; +$PALANG['pStatus_undeliverable'] = 'možno NEDORUČITEĽNÉ '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/sl.lang b/languages/sl.lang index eb832669..a04c1ecc 100644 --- a/languages/sl.lang +++ b/languages/sl.lang @@ -414,7 +414,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX +$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/sv.lang b/languages/sv.lang index 686a00ea..4aa51d9f 100644 --- a/languages/sv.lang +++ b/languages/sv.lang @@ -424,7 +424,10 @@ $PALANG['pBroadcast_error_empty'] = 'Fälten namn, ämne och meddelande ska inte $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = 'kan eventuellt ej levereras '; +$PALANG['pStatus_undeliverable'] = 'kan eventuellt ej levereras '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/tr.lang b/languages/tr.lang index f338deb2..80086e73 100644 --- a/languages/tr.lang +++ b/languages/tr.lang @@ -414,7 +414,10 @@ $PALANG['pAdminMenu_broadcast_message'] = 'Sistem mesajı'; $PALANG['pBroadcast_error_empty'] = 'İsim, Konu ve Mesaj gibi alanlar boş bırakılmamalı!'; $PALANG['broadcast_mailboxes_only'] = 'Sadece belirtilen e-posta hesaplarına gönder'; $PALANG['broadcast_to_domains'] = 'Domainlere gönder:'; -$PALANG['pStatus_undeliverable'] = 'GÖNDERİLEMEMİŞ veya gönderilemeyen olabilir '; +$PALANG['pStatus_undeliverable'] = 'GÖNDERİLEMEMİŞ veya gönderilemeyen olabilir '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Hesap pasif '; $PALANG['pStatus_expired'] = 'Şifrenin süresi doldu '; $PALANG['pStatus_vacation'] = 'Tatil modu aktif '; diff --git a/languages/tw.lang b/languages/tw.lang index 557397ec..6ff429e9 100644 --- a/languages/tw.lang +++ b/languages/tw.lang @@ -416,7 +416,10 @@ $PALANG['pAdminMenu_broadcast_message'] = '發送給所有用戶'; $PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message shouldn\'t be empty!'; # XXX $PALANG['broadcast_mailboxes_only'] = 'Only send to mailboxes'; # XXX $PALANG['broadcast_to_domains'] = 'Send to domains:'; # XXX -$PALANG['pStatus_undeliverable'] = '可能無法送遞 '; +$PALANG['pStatus_undeliverable'] = '可能無法送遞 '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Account disabled '; # XXX $PALANG['pStatus_expired'] = 'Password expired '; # XXX $PALANG['pStatus_vacation'] = 'Vacation enabled '; # XXX diff --git a/languages/ua.lang b/languages/ua.lang index 9362c843..1df3ca06 100644 --- a/languages/ua.lang +++ b/languages/ua.lang @@ -425,7 +425,10 @@ $PALANG['pBroadcast_error_empty'] = 'Поля Ім'я, Тема і Пов $PALANG['broadcast_mailboxes_only'] = 'Відправити тільки на поштові скриньки'; $PALANG['broadcast_to_domains'] = 'Надіслати на домени:'; -$PALANG['pStatus_undeliverable'] = 'може бути НЕМОЖЛИВО ДОСТАВИТИ '; +$PALANG['pStatus_undeliverable'] = 'може бути НЕМОЖЛИВО ДОСТАВИТИ '; # XXX English text changed: Undeliverable local destination. Please retranslate. +$PALANG['pStatus_undeliverable_tooltip'] = 'Not listed as a local destination.'; # XXX +$PALANG['pStatus_external'] = 'External destination'; # XXX +$PALANG['pStatus_external_tooltip'] = 'Outside your managed domains.'; # XXX $PALANG['pStatus_disabled'] = 'Обліковий запис відключений '; $PALANG['pStatus_expired'] = 'Термін дії пароля минув '; $PALANG['pStatus_vacation'] = 'Автовідповідач увімкнено '; diff --git a/model/AliasHandler.php b/model/AliasHandler.php index 00f279c0..e23101bc 100644 --- a/model/AliasHandler.php +++ b/model/AliasHandler.php @@ -436,7 +436,7 @@ class AliasHandler extends PFAHandler } if ($this->struct['status']['display_in_list'] && Config::bool('show_status')) { - $db_result[$key]['status'] = gen_show_status($db_result[$key]['address']); + $db_result[$key]['status'] = gen_show_status($db_result[$key]['address'], $this->allowed_domains); } } diff --git a/public/list-virtual.php b/public/list-virtual.php index 68d3b15b..755935bf 100644 --- a/public/list-virtual.php +++ b/public/list-virtual.php @@ -351,7 +351,7 @@ $gen_show_status_mailbox = array(); $divide_quota = array('current' => [], 'quota' => [], 'percent' => [], 'quota_width' => []); for ($i = 0; $i < sizeof($tMailbox); $i++) { - $gen_show_status_mailbox[$i] = gen_show_status($tMailbox[$i]['username']); + $gen_show_status_mailbox[$i] = gen_show_status($tMailbox[$i]['username'], $list_domains); $divide_quota['current'][$i] = Config::Lang('unknown'); $divide_quota['quota_width'][$i] = 0; diff --git a/templates/list-virtual.tpl b/templates/list-virtual.tpl index aa7a241a..fa4b6653 100644 --- a/templates/list-virtual.tpl +++ b/templates/list-virtual.tpl @@ -132,8 +132,15 @@
{if $CONF.show_undeliverable===YES}   - {$CONF.show_status_text} - ={$PALANG.pStatus_undeliverable} + + {$CONF.show_status_text} + ={$PALANG.pStatus_undeliverable} + +   + + {$CONF.show_status_text} + ={$PALANG.pStatus_external} + {/if} {if $CONF.show_popimap===YES}   diff --git a/tests/AliasDestinationStatusTest.php b/tests/AliasDestinationStatusTest.php new file mode 100644 index 00000000..5686b7b5 --- /dev/null +++ b/tests/AliasDestinationStatusTest.php @@ -0,0 +1,89 @@ +savedConfig = $CONF; + $CONF['show_undeliverable'] = 'YES'; + $CONF['show_undeliverable_color'] = 'tomato'; + $CONF['show_external_color'] = 'lightblue'; + $CONF['show_undeliverable_exceptions'] = ['exception.test']; + $CONF['vacation_domain'] = 'vacation.test'; + $CONF['recipient_delimiter'] = '+'; + $CONF['show_popimap'] = 'NO'; + $CONF['show_vacation'] = 'NO'; + $CONF['show_disabled'] = 'NO'; + $CONF['password_expiration'] = 'NO'; + $CONF['show_custom_domains'] = []; + + foreach (['local.test', 'alias.test', 'private.test'] as $domain) { + db_insert('domain', ['domain' => $domain, 'description' => 'status test', 'transport' => '']); + } + } + + protected function tearDown(): void + { + global $CONF; + $CONF = $this->savedConfig; + db_execute('DELETE FROM ' . table_by_key('alias')); + db_execute('DELETE FROM ' . table_by_key('alias_domain')); + db_execute('DELETE FROM ' . table_by_key('domain')); + } + + private function alias(string $address, string $goto): void + { + db_execute('INSERT INTO ' . table_by_key('alias') . ' (address, goto, domain) VALUES (?, ?, ?)', [$address, $goto, explode('@', $address)[1]]); + } + + private function renderStatus(string $goto, array $domains = ['local.test', 'alias.test']): string + { + db_execute('DELETE FROM ' . table_by_key('alias') . ' WHERE address = ?', ['source@local.test']); + $this->alias('source@local.test', $goto); + return gen_show_status('source@local.test', $domains); + } + + public function testMissingLocalAndExternalDestinationsAreIndependent(): void + { + $local = $this->renderStatus('missing@local.test'); + self::assertStringContainsString('background-color:tomato', $local); + self::assertStringNotContainsString('background-color:lightblue', $local); + $mixed = $this->renderStatus('missing@local.test, person@outside.test'); + self::assertStringContainsString('background-color:tomato', $mixed); + self::assertStringContainsString('background-color:lightblue', $mixed); + } + + public function testOtherAdministratorsRecordsDoNotAffectOutput(): void + { + $before = $this->renderStatus('person@private.test'); + $this->alias('person@private.test', 'person@private.test'); + self::assertSame($before, $this->renderStatus('person@private.test')); + self::assertStringContainsString('background-color:lightblue', $before); + self::assertStringNotContainsString('background-color:tomato', $before); + self::assertStringContainsString('background-color:lightblue', $this->renderStatus('missing@local.test', [])); + } + + public function testKnownRecipientsCatchallsAndExceptions(): void + { + $this->alias('person@local.test', 'person@local.test'); + self::assertStringNotContainsString('background-color:', $this->renderStatus('person+tag@local.test')); + $this->alias('@local.test', 'person@local.test'); + self::assertStringNotContainsString('background-color:', $this->renderStatus('anything@local.test')); + self::assertStringNotContainsString('background-color:', $this->renderStatus('person@exception.test,person@vacation.test')); + } + + public function testAliasDomainsRespectTargetPermissions(): void + { + db_execute('INSERT INTO ' . table_by_key('alias_domain') . ' (alias_domain, target_domain, active) VALUES (?, ?, ?)', ['alias.test', 'local.test', true]); + $this->alias('person@local.test', 'person@local.test'); + self::assertStringNotContainsString('background-color:', $this->renderStatus('person@alias.test')); + self::assertStringContainsString('background-color:tomato', $this->renderStatus('missing@alias.test')); + $hidden = $this->renderStatus('person@alias.test', ['alias.test']); + db_execute('DELETE FROM ' . table_by_key('alias') . ' WHERE address = ?', ['person@local.test']); + self::assertSame($hidden, $this->renderStatus('person@alias.test', ['alias.test'])); + self::assertStringContainsString('background-color:lightblue', $hidden); + } +}