First upload of wblist page

[qtadmin.git] / quarantine.php

diff --git a/quarantine.php b/quarantine.php
index 788f78ae4499a8e85ecdc41652ed02ecb36f20a6..b6703d866c802ba867f55631ee32a9a8af82ae56 100644 (file)
--- a/quarantine.php
+++ b/quarantine.php
@@ -14,7 +14,7 @@
         echo $util->getFooter();
     }
 
         echo $util->getFooter();
     }
 

-    function handleRequest($request, $ids) {
+    function handleRequest($util, $request, $ids) {

         global $CFG;
 
         $query = array();
         global $CFG;
 
         $query = array();


@@ -25,6 +25,7 @@
             if (is_object($mail) && true == $util->authorized($mail->recipient)) {
                 $secret_id = $mail->secret_id;
                 $recipient = $mail->recipient;
             if (is_object($mail) && true == $util->authorized($mail->recipient)) {
                 $secret_id = $mail->secret_id;
                 $recipient = $mail->recipient;

+                $sender    = $mail->sender;

 
                 if ($request == 'release') {
                     $amavisserver = $CFG->amavisd_db_host;
 
                 if ($request == 'release') {
                     $amavisserver = $CFG->amavisd_db_host;


@@ -55,6 +56,8 @@
                     $query[] = "UPDATE msgrcpt SET rs = 'R' WHERE mail_id = '$mail_id'";
                 } else if ($request == 'delete') {
                     $query[] = "UPDATE msgrcpt SET rs = 'D' WHERE mail_id = '$mail_id'";
                     $query[] = "UPDATE msgrcpt SET rs = 'R' WHERE mail_id = '$mail_id'";
                 } else if ($request == 'delete') {
                     $query[] = "UPDATE msgrcpt SET rs = 'D' WHERE mail_id = '$mail_id'";

+                } else if ($request == 'block') {
+                    $query[] = $sender;

                 } else {
                     error("Unknown operation [$request]");
                     exit;
                 } else {
                     error("Unknown operation [$request]");
                     exit;


@@ -70,21 +73,37 @@
     $request = isset($_GET['op']) ? $_GET['op'] : '';
     if ($loggedIn && isset($_GET['id'])) {
         $ids = explode(',', $_GET['id']);
     $request = isset($_GET['op']) ? $_GET['op'] : '';
     if ($loggedIn && isset($_GET['id'])) {
         $ids = explode(',', $_GET['id']);

-        $query = handleRequest($request, $ids);
-        $success = $DB->update($query);
+        if ($request == 'block') {
+            // /add/(whitelist|blacklist)/(.+)
+            $query = handleRequest($util, $request, $ids);
+            $data = json_encode($query);
+            if ($util->isAdmin()) {
+                $method = '/add/blacklist';
+            } else {
+                $method = '/add/blacklist/' . $util->getUser();
+            }
+            $success = $util->makeRestCall($method, $data);
+        } else {
+            $query = handleRequest($util, $request, $ids);
+            $success = $DB->update($query);
+        }

         if (! $success) {
         if (! $success) {

-            error("Message not released, contact administrator [$query]");
+            if ($request == 'block') {
+                error("Could not blacklist sender");
+            } else {
+                error("Message not released, contact administrator [$query]");
+            }

             exit;
         }
             exit;
         }

-        header('Location: index.php');
+        header('Location: qtadmin.php');

     } else if ($loggedIn && $request == 'purge') {
         $marked = unserialize($_SESSION['marked']);
         unset($_SESSION['marked']);
         $query = array();
         $error = array();
         foreach ($marked as $mail_id) {
     } else if ($loggedIn && $request == 'purge') {
         $marked = unserialize($_SESSION['marked']);
         unset($_SESSION['marked']);
         $query = array();
         $error = array();
         foreach ($marked as $mail_id) {

-            $mail = $DB->getMail($mail_id);
-            if (is_object($mail) && true == $util->authorized($mail->recipient)) {
+            $recipient = $DB->getRecipient($mail_id);
+            if ($recipient && true == $util->authorized($recipient)) {

                 $query[] = "delete from msgs where mail_id = '$mail_id'";
                 $query[] = "delete from msgrcpt where mail_id = '$mail_id'";
                 $query[] = "delete from quarantine where mail_id = '$mail_id'";
                 $query[] = "delete from msgs where mail_id = '$mail_id'";
                 $query[] = "delete from msgrcpt where mail_id = '$mail_id'";
                 $query[] = "delete from quarantine where mail_id = '$mail_id'";


@@ -99,9 +118,9 @@
             error("The following messages was not purged [$str], contact administrator");
             exit;
         }
             error("The following messages was not purged [$str], contact administrator");
             exit;
         }

-        header('Location: index.php');
+        header('Location: qtadmin.php');

     } else if ($loggedIn) {
     } else if ($loggedIn) {

-        header('Location: index.php');
+        header('Location: qtadmin.php');

     } else {
         header('Location: auth.php');
     }
     } else {
         header('Location: auth.php');
     }