From 967ac25949bca7e194fe9e96d41fdbc66ff93c8d Mon Sep 17 00:00:00 2001 From: Manuel Dalla Lana Date: Mon, 21 Aug 2017 19:34:13 +0200 Subject: [PATCH] Add counter for entries in white/black list Close #509 --- CHANGELOG.md | 5 +++ mailscanner/languages/de.php | 4 +- mailscanner/languages/en.php | 4 +- mailscanner/languages/fr.php | 4 +- mailscanner/languages/it.php | 4 +- mailscanner/languages/pt_br.php | 4 +- mailscanner/lists.php | 65 +++++++++++++++++++-------------- mailscanner/quarantine.php | 2 +- 8 files changed, 54 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61b40c304..bd7534059 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +1.2.6-dev +----------- +Improvements +- Add entries counter on white and black list + 1.2.5 ----------- Improvements diff --git a/mailscanner/languages/de.php b/mailscanner/languages/de.php index c628b9064..bd5eb376c 100644 --- a/mailscanner/languages/de.php +++ b/mailscanner/languages/de.php @@ -299,8 +299,8 @@ 'to07' => 'An:', 'list07' => 'Liste:', 'action07' => 'Aktion:', - 'wl07' => 'Weisse Liste', - 'bl07' => 'Schwarze Liste', + 'wl07' => 'Weisse Liste - %d Einträge', + 'bl07' => 'Schwarze Liste - %d Einträge', 'reset07' => 'Zurücksetzen', 'add07' => 'Hinzufügen', 'delete07' => 'Löschen', diff --git a/mailscanner/languages/en.php b/mailscanner/languages/en.php index 56285dee7..83eea999d 100644 --- a/mailscanner/languages/en.php +++ b/mailscanner/languages/en.php @@ -299,8 +299,8 @@ 'to07' => 'To:', 'list07' => 'List:', 'action07' => 'Action:', - 'wl07' => 'Whitelist', - 'bl07' => 'Blacklist', + 'wl07' => 'Whitelist - %d entries', + 'bl07' => 'Blacklist - %d entries', 'reset07' => 'Reset', 'add07' => 'Add', 'delete07' => 'Delete', diff --git a/mailscanner/languages/fr.php b/mailscanner/languages/fr.php index b77067455..4ec7bc0a4 100644 --- a/mailscanner/languages/fr.php +++ b/mailscanner/languages/fr.php @@ -299,8 +299,8 @@ 'to07' => 'À :', 'list07' => 'Liste :', 'action07' => 'Action :', - 'wl07' => 'Liste Blanche', - 'bl07' => 'Liste Noire', + 'wl07' => 'Liste Blanche - %d entrées', + 'bl07' => 'Liste Noire - %d entrées', 'reset07' => 'Réinitialiser', 'add07' => 'Ajouter', 'delete07' => 'Supprimer', diff --git a/mailscanner/languages/it.php b/mailscanner/languages/it.php index 78ffae50d..233152506 100644 --- a/mailscanner/languages/it.php +++ b/mailscanner/languages/it.php @@ -299,8 +299,8 @@ 'to07' => 'A:', 'list07' => 'Lista:', 'action07' => 'Azione:', - 'wl07' => 'Whitelist', - 'bl07' => 'Blacklist', + 'wl07' => 'Whitelist - %d voci', + 'bl07' => 'Blacklist - %d voci', 'reset07' => 'Resetta', 'add07' => 'Aggiungi', 'delete07' => 'Elimina', diff --git a/mailscanner/languages/pt_br.php b/mailscanner/languages/pt_br.php index b6c33db5f..4c94fb419 100644 --- a/mailscanner/languages/pt_br.php +++ b/mailscanner/languages/pt_br.php @@ -299,8 +299,8 @@ 'to07' => 'Para:', 'list07' => 'Lista:', 'action07' => 'Ação:', - 'wl07' => 'Lista Branca', - 'bl07' => 'Lista Negra', + 'wl07' => 'Lista Branca - %d entradas', + 'bl07' => 'Lista Negra - %d entradas', 'reset07' => 'Limpa', 'add07' => 'Adiciona', 'delete07' => 'Excluir', diff --git a/mailscanner/lists.php b/mailscanner/lists.php index ab7584817..5d392ae59 100644 --- a/mailscanner/lists.php +++ b/mailscanner/lists.php @@ -26,7 +26,6 @@ */ require_once __DIR__ . '/functions.php'; - require __DIR__ . '/login.function.php'; html_start(__('wblists07'), 0, false, false); @@ -298,27 +297,36 @@ $url_list = ''; } +/** + * @param string $sql + * @param string $list + * @return array + */ function build_table($sql, $list) { $sth = dbquery($sql); + $table_html = ''; + $entries = $sth->num_rows; if ($sth->num_rows > 0) { - echo '' . "\n"; - echo ' ' . "\n"; - echo ' ' . "\n"; - echo ' ' . "\n"; - echo ' ' . "\n"; - echo ' ' . "\n"; + $table_html .= '
' . __('from07') . '' . __('to07') . '' . __('action07') . '
' . "\n"; + $table_html .= ' ' . "\n"; + $table_html .= ' ' . "\n"; + $table_html .= ' ' . "\n"; + $table_html .= ' ' . "\n"; + $table_html .= ' ' . "\n"; while ($row = $sth->fetch_row()) { - echo ' ' . "\n"; - echo ' ' . "\n"; - echo ' ' . "\n"; - echo ' ' . "\n"; + $table_html .= ' ' . "\n"; + $table_html .= ' ' . "\n"; + $table_html .= ' ' . "\n"; + $table_html .= ' ' . "\n"; } - echo '
' . __('from07') . '' . __('to07') . '' . __('action07') . '
' . $row[1] . '' . $row[2] . '' . __('delete07') . '' . "\n"; - echo '
' . $row[1] . '' . $row[2] . '' . __('delete07') . '' . "\n"; + $table_html .= '
' . "\n"; + $table_html .= '' . "\n"; } else { - echo __('noentries07') . "\n"; + $table_html = __('noentries07') . "\n"; } + + return array('html' => $table_html, 'entry_number' => $entries); } echo ' @@ -401,29 +409,32 @@ function build_table($sql, $list) ' . implode('
', $errors) . ' '; } + +$whitelist = build_table( + 'SELECT id, from_address, to_address FROM whitelist WHERE ' . $_SESSION['global_list'] . ' ORDER BY from_address', + 'w' +); +$blacklist = build_table( + 'SELECT id, from_address, to_address FROM blacklist WHERE ' . $_SESSION['global_list'] . ' ORDER BY from_address', + 'b' +); echo '
- - + + - '; +echo '
' . __('wl07') . '' . __('bl07') . '' . sprintf(__('wl07'), $whitelist['entry_number']) . '' . sprintf(__('bl07'), $whitelist['entry_number']) . '
'; -build_table( - 'SELECT id, from_address, to_address FROM whitelist WHERE ' . $_SESSION['global_list'] . ' ORDER BY from_address', - 'w' -); -echo ' - '; -build_table( - 'SELECT id, from_address, to_address FROM blacklist WHERE ' . $_SESSION['global_list'] . ' ORDER BY from_address', - 'b' -); +echo $whitelist['html']; +echo ' +'; +echo $blacklist['html']; echo '
'; diff --git a/mailscanner/quarantine.php b/mailscanner/quarantine.php index fa6b0efbe..2d222dfe9 100644 --- a/mailscanner/quarantine.php +++ b/mailscanner/quarantine.php @@ -190,7 +190,7 @@ AND BINARY id IN ($msg_ids)"; -// Hide high spam/mcp from regular users if enabled + // Hide high spam/mcp from regular users if enabled if (defined('HIDE_HIGH_SPAM') && HIDE_HIGH_SPAM === true && $_SESSION['user_type'] === 'U') { $sql .= ' AND