mirror/postfixadmin
0
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2024-09-19 11:12:15 +02:00
Code

manual merge of fix from https://github.com/postfixadmin/postfixadmin/issues/404

Browse Source 
(try and filter CSV export lists to the current selected domain)
This commit is contained in:
David Goodwin 2020-12-24 10:46:04 +00:00
parent a223f2f6a4
commit d391847ed9
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/list.php
View File

@ -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)) {

2
templates/list-virtual.tpl
View File

@ -96,7 +96,7 @@
class="btn btn-default"><span class="glyphicon glyphicon-plus-sign"
aria-hidden="true"></span> {$PALANG.add_mailbox}</a>
{/if}
<a role="button" class="btn btn-default" href="list.php?table=mailbox&amp;output=csv"><span
<a role="button" class="btn btn-default" href="list.php?table=mailbox&amp;output=csv&amp;domain={$domain_selected}"><span
class="glyphicon glyphicon-export" aria-hidden="true"></span> {$PALANG.download_csv}</a>
</div>
</div>

2
templates/list.tpl
View File

@ -151,7 +151,7 @@
{if $msg.can_create}
<a href="edit.php?table={$table|escape:"url"}" role="button" class="btn btn-default"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span> {$PALANG.{$formconf.create_button}}</a>
{/if}
<a href="list.php?table={$table|escape:"url"}&amp;output=csv" role="button" class="btn btn-default"><span class="glyphicon glyphicon-export" aria-hidden="true"></span> {$PALANG.download_csv}</a>
<a href="list.php?table={$table|escape:"url"}&amp;output=csv&amp;domain={$domain_selected}" role="button" class="btn btn-default"><span class="glyphicon glyphicon-export" aria-hidden="true"></span> {$PALANG.download_csv}</a>
</div>
</div>
</div>