diff --git a/public/list.php b/public/list.php index fc3dfdfa..024e0bfd 100644 --- a/public/list.php +++ b/public/list.php @@ -101,6 +101,7 @@ if (count($handler->infomsg)) { flash_error($handler->infomsg); } +$fDomain = safepost('fDomain', safeget('domain', safesession('list-virtual:domain'))); if (safeget('output') == 'csv') { $out = fopen('php://output', 'w'); @@ -128,6 +129,11 @@ if (safeget('output') == 'csv') { # print items as csv foreach ($items as $item) { $fields = array(); + + // skip domains that do not match selected domain (see: https://github.com/postfixadmin/postfixadmin/issues/404) + if (!empty($fDomain) && $item['domain'] != $fDomain) { + continue; + } foreach ($columns as $column) { $values = $item[$column]; if (is_array($values)) { diff --git a/templates/list-virtual.tpl b/templates/list-virtual.tpl index 61460654..95b160fa 100644 --- a/templates/list-virtual.tpl +++ b/templates/list-virtual.tpl @@ -96,7 +96,7 @@ class="btn btn-default"> {$PALANG.add_mailbox} {/if} - {$PALANG.download_csv} diff --git a/templates/list.tpl b/templates/list.tpl index 73e451f4..c49da83c 100644 --- a/templates/list.tpl +++ b/templates/list.tpl @@ -151,7 +151,7 @@ {if $msg.can_create} {$PALANG.{$formconf.create_button}} {/if} - {$PALANG.download_csv} + {$PALANG.download_csv}