diff --git a/languages/bg.lang b/languages/bg.lang index cad1722d..642e66ff 100644 --- a/languages/bg.lang +++ b/languages/bg.lang @@ -90,6 +90,8 @@ $PALANG['pOverview_welcome'] = 'Преглед на '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX $PALANG['pOverview_alias_address'] = 'От'; $PALANG['active'] = 'Активен'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'Е-мейл'; diff --git a/languages/ca.lang b/languages/ca.lang index 45107b14..923b630f 100644 --- a/languages/ca.lang +++ b/languages/ca.lang @@ -88,6 +88,8 @@ $PALANG['pOverview_welcome'] = 'Resum de '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX $PALANG['pOverview_alias_address'] = 'De'; $PALANG['active'] = 'Actiu'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'E-mail'; # XXX diff --git a/languages/cn.lang b/languages/cn.lang index a36c9990..c075cb2a 100644 --- a/languages/cn.lang +++ b/languages/cn.lang @@ -89,6 +89,8 @@ $PALANG['pOverview_welcome'] = '浏览 '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX $PALANG['pOverview_alias_address'] = '前往'; $PALANG['active'] = '活动'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = '邮件地址'; diff --git a/languages/cs.lang b/languages/cs.lang index 03d466f9..32b4a898 100644 --- a/languages/cs.lang +++ b/languages/cs.lang @@ -97,6 +97,8 @@ $PALANG['pOverview_welcome'] = 'Přehled domény '; $PALANG['pOverview_alias_domain_aliases'] = 'Přesměrované domény'; $PALANG['pOverview_alias_address'] = 'Od'; $PALANG['active'] = 'Aktivní'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[a %s dalších...]'; $PALANG['pOverview_mailbox_username'] = 'Email'; diff --git a/languages/da.lang b/languages/da.lang index da748700..7c01a664 100644 --- a/languages/da.lang +++ b/languages/da.lang @@ -93,6 +93,8 @@ $PALANG['pOverview_welcome'] = 'Oversigt for '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias domæner'; $PALANG['pOverview_alias_address'] = 'Alias'; $PALANG['active'] = 'Aktiv'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[og %s til...]'; $PALANG['pOverview_mailbox_username'] = 'Emailadresse'; diff --git a/languages/de.lang b/languages/de.lang index fdd5b4ec..99455398 100644 --- a/languages/de.lang +++ b/languages/de.lang @@ -91,6 +91,8 @@ $PALANG['pOverview_welcome'] = 'Überblick über '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias-Domains'; $PALANG['pOverview_alias_address'] = 'Von'; $PALANG['active'] = 'Aktiv'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[und %s weitere...]'; $PALANG['pOverview_mailbox_username'] = 'Email'; diff --git a/languages/en.lang b/languages/en.lang index 8f6b4236..afaf8982 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -97,6 +97,8 @@ $PALANG['pOverview_welcome'] = 'Overview for '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; $PALANG['pOverview_alias_address'] = 'From'; $PALANG['active'] = 'Active'; +$PALANG['inactive'] = 'Inactive'; +$PALANG['alias_active_filter'] = 'Forward status:'; $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; $PALANG['pOverview_mailbox_username'] = 'Email'; diff --git a/languages/es.lang b/languages/es.lang index 543d9f67..508a09e2 100644 --- a/languages/es.lang +++ b/languages/es.lang @@ -89,6 +89,8 @@ $PALANG['pOverview_welcome'] = 'Resumen de '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias de Dominios'; $PALANG['pOverview_alias_address'] = 'De'; $PALANG['active'] = 'Activo'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'SMTP'; $PALANG['and_x_more'] = '[y %s más...]'; $PALANG['pOverview_mailbox_username'] = 'E-mail'; diff --git a/languages/et.lang b/languages/et.lang index 5d070b79..97ea7279 100644 --- a/languages/et.lang +++ b/languages/et.lang @@ -89,6 +89,8 @@ $PALANG['pOverview_welcome'] = 'Ülevaade domeenist: '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX $PALANG['pOverview_alias_address'] = 'Kellelt'; $PALANG['active'] = 'Aktiivne'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'E-posti aadress'; diff --git a/languages/eu.lang b/languages/eu.lang index 4a50a20e..aa27940b 100644 --- a/languages/eu.lang +++ b/languages/eu.lang @@ -88,6 +88,8 @@ $PALANG['pOverview_welcome'] = 'Laburpena '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX $PALANG['pOverview_alias_address'] = 'Igorlea'; $PALANG['active'] = 'Aktibatua'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'E-mail'; diff --git a/languages/fi.lang b/languages/fi.lang index 77ba64f8..0e49b03f 100644 --- a/languages/fi.lang +++ b/languages/fi.lang @@ -90,6 +90,8 @@ $PALANG['pOverview_welcome'] = 'Yleisnäkymä '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domainit'; $PALANG['pOverview_alias_address'] = 'Keneltä'; $PALANG['active'] = 'Aktiivinen'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[ja %s lisää...]'; $PALANG['pOverview_mailbox_username'] = 'Sähköposti'; diff --git a/languages/fo.lang b/languages/fo.lang index 5ebfee12..bd414f09 100644 --- a/languages/fo.lang +++ b/languages/fo.lang @@ -89,6 +89,8 @@ $PALANG['pOverview_welcome'] = 'Yvirlit yvir '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX $PALANG['pOverview_alias_address'] = 'Frá'; $PALANG['active'] = 'Virkin'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'E-post'; diff --git a/languages/fr.lang b/languages/fr.lang index b546a17a..9550b594 100644 --- a/languages/fr.lang +++ b/languages/fr.lang @@ -93,6 +93,8 @@ $PALANG['pOverview_welcome'] = 'Vue d\'ensemble pour '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias de domaines'; $PALANG['pOverview_alias_address'] = 'De'; $PALANG['active'] = 'Actif'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[et %s en plus...]'; $PALANG['pOverview_mailbox_username'] = 'courriel'; diff --git a/languages/gl.lang b/languages/gl.lang index 8182cd96..d24d7557 100644 --- a/languages/gl.lang +++ b/languages/gl.lang @@ -87,6 +87,8 @@ $PALANG['pOverview_welcome'] = 'Resumo de '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias de Dominios'; $PALANG['pOverview_alias_address'] = 'De'; $PALANG['active'] = 'Activo'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[e %s máis...]'; $PALANG['pOverview_mailbox_username'] = 'E-mail'; diff --git a/languages/hr.lang b/languages/hr.lang index 6eeaf5a3..4582a7e6 100644 --- a/languages/hr.lang +++ b/languages/hr.lang @@ -88,6 +88,8 @@ $PALANG['pOverview_welcome'] = 'Pregled za '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX $PALANG['pOverview_alias_address'] = 'Od'; $PALANG['active'] = 'Aktivan'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'E-pošta'; diff --git a/languages/hu.lang b/languages/hu.lang index 72c9e132..6fe660c3 100644 --- a/languages/hu.lang +++ b/languages/hu.lang @@ -90,6 +90,8 @@ $PALANG['pOverview_welcome'] = 'Áttekintés: '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX $PALANG['pOverview_alias_address'] = 'Honnan'; $PALANG['active'] = 'Aktív'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'Email'; diff --git a/languages/is.lang b/languages/is.lang index 377e4461..cbb2da51 100644 --- a/languages/is.lang +++ b/languages/is.lang @@ -89,6 +89,8 @@ $PALANG['pOverview_welcome'] = 'Yfirlit fyrir '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX $PALANG['pOverview_alias_address'] = 'Póstur fyrir'; $PALANG['active'] = 'Virkt'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'Póstfang'; diff --git a/languages/it.lang b/languages/it.lang index 7d84aa3e..2f42ec1b 100644 --- a/languages/it.lang +++ b/languages/it.lang @@ -91,6 +91,8 @@ $PALANG['pOverview_welcome'] = 'Resoconto per '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias di Dominio'; $PALANG['pOverview_alias_address'] = 'Da'; $PALANG['active'] = 'Attivo'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[più %s altri...]'; $PALANG['pOverview_mailbox_username'] = 'Email'; diff --git a/languages/ja.lang b/languages/ja.lang index c1e8ee84..028092e0 100644 --- a/languages/ja.lang +++ b/languages/ja.lang @@ -91,6 +91,8 @@ $PALANG['pOverview_welcome'] = '概要 '; $PALANG['pOverview_alias_domain_aliases'] = 'エイリアスドメイン'; $PALANG['pOverview_alias_address'] = '転送元'; $PALANG['active'] = 'アクティブ'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[その他 %s 個]'; $PALANG['pOverview_mailbox_username'] = 'メールアドレス'; diff --git a/languages/lt.lang b/languages/lt.lang index 3d03aace..8d04ca19 100644 --- a/languages/lt.lang +++ b/languages/lt.lang @@ -89,6 +89,8 @@ $PALANG['pOverview_welcome'] = 'Peržiūra '; $PALANG['pOverview_alias_domain_aliases'] = 'Srities sinonimai'; $PALANG['pOverview_alias_address'] = 'Iš'; $PALANG['active'] = 'Įjungtas'; # XXX check text - should be 'Active' +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[ir %s daugiau...]'; $PALANG['pOverview_mailbox_username'] = 'El.paštas'; diff --git a/languages/mk.lang b/languages/mk.lang index 9f39f553..f43bd014 100644 --- a/languages/mk.lang +++ b/languages/mk.lang @@ -89,6 +89,8 @@ $PALANG['pOverview_welcome'] = 'Преглед за '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX $PALANG['pOverview_alias_address'] = 'Од'; $PALANG['active'] = 'Активен'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'Адреса'; diff --git a/languages/nb.lang b/languages/nb.lang index 889f78f4..d616ff85 100644 --- a/languages/nb.lang +++ b/languages/nb.lang @@ -91,6 +91,8 @@ $PALANG['pOverview_welcome'] = 'Oversikt for '; $PALANG['pOverview_alias_domain_aliases'] = 'Aliasdomener'; $PALANG['pOverview_alias_address'] = 'Fra'; $PALANG['active'] = 'Aktiv'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[og %s flere...]'; $PALANG['pOverview_mailbox_username'] = 'E-post'; diff --git a/languages/nl.lang b/languages/nl.lang index 9013832d..fa13f7a3 100644 --- a/languages/nl.lang +++ b/languages/nl.lang @@ -91,6 +91,8 @@ $PALANG['pOverview_welcome'] = 'Overzicht voor '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias domeinen'; $PALANG['pOverview_alias_address'] = 'Van'; $PALANG['active'] = 'Actief'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[en %s meer...]'; $PALANG['pOverview_mailbox_username'] = 'e-mail'; diff --git a/languages/nn.lang b/languages/nn.lang index 01b0623f..d078fb56 100644 --- a/languages/nn.lang +++ b/languages/nn.lang @@ -89,6 +89,8 @@ $PALANG['pOverview_welcome'] = 'Oversikt for '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX $PALANG['pOverview_alias_address'] = 'Fra'; $PALANG['active'] = 'Aktiv'; # XXX check text - should be 'Active' +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'E-post'; diff --git a/languages/pl.lang b/languages/pl.lang index 7062176e..03fdaa45 100644 --- a/languages/pl.lang +++ b/languages/pl.lang @@ -92,6 +92,8 @@ $PALANG['pOverview_welcome'] = 'Dane zbiorcze dla domeny '; $PALANG['pOverview_alias_domain_aliases'] = 'Domeny aliasowe'; $PALANG['pOverview_alias_address'] = 'Od'; $PALANG['active'] = 'Aktywny'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[i %s wiecej...]'; $PALANG['pOverview_mailbox_username'] = 'Email'; diff --git a/languages/pt-br.lang b/languages/pt-br.lang index 43f8e495..85ec56be 100644 --- a/languages/pt-br.lang +++ b/languages/pt-br.lang @@ -91,6 +91,8 @@ $PALANG['pOverview_welcome'] = 'Visão geral de '; $PALANG['pOverview_alias_domain_aliases'] = 'Aliases de Domínio'; $PALANG['pOverview_alias_address'] = 'De'; $PALANG['active'] = 'Habilitado'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[e %s mais...]'; $PALANG['pOverview_mailbox_username'] = 'Email'; diff --git a/languages/pt-pt.lang b/languages/pt-pt.lang index 498d4134..8feae5f4 100644 --- a/languages/pt-pt.lang +++ b/languages/pt-pt.lang @@ -91,6 +91,8 @@ $PALANG['pOverview_welcome'] = 'Visão geral de '; $PALANG['pOverview_alias_domain_aliases'] = 'Aliases de Domínio'; $PALANG['pOverview_alias_address'] = 'De'; $PALANG['active'] = 'Activado'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[e %s mais...]'; $PALANG['pOverview_mailbox_username'] = 'Email'; diff --git a/languages/ro.lang b/languages/ro.lang index d27ea5e2..6731537d 100644 --- a/languages/ro.lang +++ b/languages/ro.lang @@ -90,6 +90,8 @@ $PALANG['pOverview_welcome'] = 'Vizualizare pentru '; $PALANG['pOverview_alias_domain_aliases'] = 'Domenii alias'; $PALANG['pOverview_alias_address'] = 'De la'; $PALANG['active'] = 'Activ'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[inca %s ...]'; $PALANG['pOverview_mailbox_username'] = 'Email'; diff --git a/languages/ru.lang b/languages/ru.lang index f32487f4..22d9906f 100644 --- a/languages/ru.lang +++ b/languages/ru.lang @@ -93,6 +93,8 @@ $PALANG['pOverview_welcome'] = 'Обзор для '; $PALANG['pOverview_alias_domain_aliases'] = 'Алиасы доменов'; $PALANG['pOverview_alias_address'] = 'От'; $PALANG['active'] = 'Активен'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[и еще %s...]'; $PALANG['pOverview_mailbox_username'] = 'Ящик'; diff --git a/languages/sk.lang b/languages/sk.lang index d87aff80..07e7f0eb 100644 --- a/languages/sk.lang +++ b/languages/sk.lang @@ -90,6 +90,8 @@ $PALANG['pOverview_welcome'] = 'Prehľad pre doménu '; $PALANG['pOverview_alias_domain_aliases'] = 'Aliasy domén'; $PALANG['pOverview_alias_address'] = 'Od'; $PALANG['active'] = 'Aktívny'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[a %s ďalších...]'; $PALANG['pOverview_mailbox_username'] = 'Email'; diff --git a/languages/sl.lang b/languages/sl.lang index 0bf22a82..171a729a 100644 --- a/languages/sl.lang +++ b/languages/sl.lang @@ -89,6 +89,8 @@ $PALANG['pOverview_welcome'] = 'Pregled za '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX $PALANG['pOverview_alias_address'] = 'Od'; $PALANG['active'] = 'Aktiven'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = 'E-pošta'; diff --git a/languages/sv.lang b/languages/sv.lang index 8096fee3..b679f372 100644 --- a/languages/sv.lang +++ b/languages/sv.lang @@ -92,6 +92,8 @@ $PALANG['pOverview_welcome'] = 'Sammanfattning för '; $PALANG['pOverview_alias_domain_aliases'] = 'Domänalias'; $PALANG['pOverview_alias_address'] = 'Från'; $PALANG['active'] = 'Aktiv'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[och %s mer...]'; $PALANG['pOverview_mailbox_username'] = 'E-post'; diff --git a/languages/tr.lang b/languages/tr.lang index 5213b28b..487dc8fd 100644 --- a/languages/tr.lang +++ b/languages/tr.lang @@ -89,6 +89,8 @@ $PALANG['pOverview_welcome'] = 'Genel Bilgiler: '; $PALANG['pOverview_alias_domain_aliases'] = 'Alias Domainleri'; $PALANG['pOverview_alias_address'] = 'Kimden'; $PALANG['active'] = 'Aktif'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[ve %s daha fazla...]'; $PALANG['pOverview_mailbox_username'] = 'E-posta'; diff --git a/languages/tw.lang b/languages/tw.lang index 89a7646e..4f4d2e72 100644 --- a/languages/tw.lang +++ b/languages/tw.lang @@ -90,6 +90,8 @@ $PALANG['pOverview_welcome'] = '瀏覽 '; $PALANG['pOverview_alias_domain_aliases'] = '網域名'; $PALANG['pOverview_alias_address'] = '前往'; $PALANG['active'] = '生效'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[and %s more...]'; # XXX $PALANG['pOverview_mailbox_username'] = '郵件地址'; diff --git a/languages/ua.lang b/languages/ua.lang index 09e3c0db..5b1ca2e1 100644 --- a/languages/ua.lang +++ b/languages/ua.lang @@ -91,6 +91,8 @@ $PALANG['pOverview_welcome'] = 'Огляд для '; $PALANG['pOverview_alias_domain_aliases'] = 'Псевдоними (аліаси) доменів'; $PALANG['pOverview_alias_address'] = 'Від кого'; $PALANG['active'] = 'Активний'; +$PALANG['inactive'] = 'Inactive'; # XXX +$PALANG['alias_active_filter'] = 'Forward status:'; # XXX $PALANG['smtp_active'] = 'Smtp'; $PALANG['and_x_more'] = '[та ще %s...]'; $PALANG['pOverview_mailbox_username'] = 'Поштова адреса (Email)'; diff --git a/public/list-virtual.php b/public/list-virtual.php index b0304943..8b22fdeb 100644 --- a/public/list-virtual.php +++ b/public/list-virtual.php @@ -54,6 +54,15 @@ if (isset($_POST['search']) && is_array($_POST['search'])) { $search = $_GET['search']; } +// Active-status filter for the alias list (all|active|inactive). Persisted in +// $_SESSION like the 'tab' selector below, so it survives pagination (whose +// links only carry &limit=...). +$fAliasActive = safeget('alias_active', safesession('list-virtual:alias_active', 'all')); +if (!in_array($fAliasActive, ['all', 'active', 'inactive'], true)) { + $fAliasActive = 'all'; +} +$_SESSION['list-virtual:alias_active'] = $fAliasActive; + if (count($list_domains) == 0) { if (authentication_has_role('global-admin')) { flash_error($PALANG['no_domains_exist']); @@ -159,6 +168,14 @@ if (count($search) == 0 || !isset($search['_'])) { $search_alias = array('_' => $search['_']); } +// Restrict the alias list to (in)active entries when the filter is set. 'active' +// is a bool field in the struct, so db_where_clause() parameterises it for us. +if ($fAliasActive === 'active') { + $search_alias['active'] = 1; +} elseif ($fAliasActive === 'inactive') { + $search_alias['active'] = 0; +} + $handler = new AliasHandler(0, $admin_username); $formconf = $handler->webformConfig(); # might change struct $alias_data = array( @@ -514,6 +531,7 @@ if (Config::bool('alias_domain')) { $smarty->assign('tAlias', $tAlias); $smarty->assign('alias_data', $alias_data); +$smarty->assign('alias_active', $fAliasActive); $smarty->assign('tMailbox', $tMailbox); $smarty->assign('gen_show_status_mailbox', $gen_show_status_mailbox, false); diff --git a/templates/list-virtual.tpl b/templates/list-virtual.tpl index b3a3485d..538b583c 100644 --- a/templates/list-virtual.tpl +++ b/templates/list-virtual.tpl @@ -64,6 +64,14 @@ {/if} {*** Aliases ***} {if $tab=='alias' || $tab=='all'} +
{$PALANG.alias_active_filter} + {if $alias_active=='all'}{$PALANG.all} + {else}{$PALANG.all}{/if} + {if $alias_active=='active'}{$PALANG.active} + {else}{$PALANG.active}{/if} + {if $alias_active=='inactive'}{$PALANG.inactive} + {else}{$PALANG.inactive}{/if} +
{$nav_bar_alias.top} {include file="list-virtual_alias.tpl"} {$nav_bar_alias.bottom} diff --git a/tests/AliasHandlerTest.php b/tests/AliasHandlerTest.php index 2e72ebdd..d013b838 100644 --- a/tests/AliasHandlerTest.php +++ b/tests/AliasHandlerTest.php @@ -390,4 +390,46 @@ class AliasHandlerTest extends \PHPUnit\Framework\TestCase $this->assertEquals(5, count($results)); $this->assertTrue(isset($results['31-test@example.com'])); } + + /** + * The list-virtual.php active-status filter works by passing an 'active' + * condition to AliasHandler::getList(). Verify that filters the list. + * @see https://github.com/postfixadmin/postfixadmin/issues/1038 + */ + public function testActiveConditionFiltersAliasList() + { + $this->addDomain('example.com', 'admin'); + + // Add one active and one inactive alias (on top of the 4 default + // aliases, which are active). + foreach (['act@example.com' => 1, 'inact@example.com' => 0] as $addr => $active) { + $x = new AliasHandler(1, 'admin', true); + $this->assertTrue($x->init($addr)); + $x->set([ + 'localpart' => explode('@', $addr)[0], + 'domain' => 'example.com', + 'active' => $active, + 'address' => $addr, + 'goto' => ['dest@example.com'], + ]); + $this->assertTrue($x->save(), json_encode($x->errormsg)); + } + + // active-only: contains our active alias and the defaults, never the inactive one. + $x = new AliasHandler(0, 'admin', true); + $this->assertTrue($x->getList(['domain' => 'example.com', 'active' => 1])); + $activeList = $x->result(); + $this->assertArrayHasKey('act@example.com', $activeList); + $this->assertArrayNotHasKey('inact@example.com', $activeList); + foreach ($activeList as $addr => $row) { + $this->assertEquals(1, $row['active'], "$addr should be active"); + } + + // inactive-only: exactly our inactive alias. + $x = new AliasHandler(0, 'admin', true); + $this->assertTrue($x->getList(['domain' => 'example.com', 'active' => 0])); + $inactiveList = $x->result(); + $this->assertEquals(['inact@example.com'], array_keys($inactiveList)); + $this->assertEquals(0, $inactiveList['inact@example.com']['active']); + } }