Add counter for entries in white/black list

Close #509
mailwatch · Aug 22, 2017 · 967ac25 · 967ac25
1 parent fcecf26
commit 967ac25
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 38 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 '<table class="blackwhitelist">' . "\n";
-        echo ' <tr>' . "\n";
-        echo '  <th>' . __('from07') . '</th>' . "\n";
-        echo '  <th>' . __('to07') . '</th>' . "\n";
-        echo '  <th>' . __('action07') . '</th>' . "\n";
-        echo ' </tr>' . "\n";
+        $table_html .= '<table class="blackwhitelist">' . "\n";
+        $table_html .= ' <tr>' . "\n";
+        $table_html .= '  <th>' . __('from07') . '</th>' . "\n";
+        $table_html .= '  <th>' . __('to07') . '</th>' . "\n";
+        $table_html .= '  <th>' . __('action07') . '</th>' . "\n";
+        $table_html .= ' </tr>' . "\n";
         while ($row = $sth->fetch_row()) {
-            echo ' <tr>' . "\n";
-            echo '  <td>' . $row[1] . '</td>' . "\n";
-            echo '  <td>' . $row[2] . '</td>' . "\n";
-            echo '  <td><a href="lists.php?token=' . $_SESSION['token'] . '&amp;submit=delete&amp;listid=' . $row[0] . '&amp;to=' . $row[2] . '&amp;list=' . $list . '">' . __('delete07') . '</a><td>' . "\n";
-            echo ' </tr>' . "\n";
+            $table_html .= ' <tr>' . "\n";
+            $table_html .= '  <td>' . $row[1] . '</td>' . "\n";
+            $table_html .= '  <td>' . $row[2] . '</td>' . "\n";
+            $table_html .= '  <td><a href="lists.php?token=' . $_SESSION['token'] . '&amp;submit=delete&amp;listid=' . $row[0] . '&amp;to=' . $row[2] . '&amp;list=' . $list . '">' . __('delete07') . '</a><td>' . "\n";
+            $table_html .= ' </tr>' . "\n";
         }
-        echo '</table>' . "\n";
+        $table_html .= '</table>' . "\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)
   <td>' . implode('<br>', $errors) . '</td>
  </tr>';
 }
+
+$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 '</table>
    </form>
    <br>
 <table cellspacing="1" width="100%" class="mail">
 <tr>
-  <th class="whitelist">' . __('wl07') . '</th>
-  <th class="blacklist">' . __('bl07') . '</th>
+  <th class="whitelist">' . sprintf(__('wl07'), $whitelist['entry_number']) . '</th>
+  <th class="blacklist">' . sprintf(__('bl07'), $whitelist['entry_number']) . '</th>
 </tr>
 <tr>
   <td class="blackwhitelist">
     <!-- Whitelist -->';
 
-build_table(
-    'SELECT id, from_address, to_address FROM whitelist WHERE ' . $_SESSION['global_list'] . ' ORDER BY from_address',
-    'w'
-);
-echo '</td>
- <td  class="blackwhitelist">
-  <!-- Blacklist -->';
-build_table(
-    'SELECT id, from_address, to_address FROM blacklist WHERE ' . $_SESSION['global_list'] . ' ORDER BY from_address',
-    'b'
-);
+echo $whitelist['html'];
+echo '</td>';
+echo '<td class="blackwhitelist">
+<!-- Blacklist -->';
+echo $blacklist['html'];
 echo '</td>
 </tr>
 </table>';

diff --git 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