prepare for wblistadm server

diff --git a/lib/utils.inc.php b/lib/utils.inc.php
index b9f7cf394c1f9ba82e2383317cb18310eb685fe5..6cea76ef1943fbc4d3c551f9e4eb27307f175248 100644 (file)
--- a/lib/utils.inc.php
+++ b/lib/utils.inc.php
@@ -196,7 +196,7 @@ class Utils {
 
         $result;
 
-        $url = $CFG->wblistadm_url . "/$method";
+        $url = $CFG->wblistadm_url . "$method";
         $token = $this->getCSRFPreventionToken($_SESSION['ticket']);
         $response = $this->RESTCall($url, $data, $_SESSION['cookies'], $token);
 

diff --git a/quarantine.php b/quarantine.php
index 6a2cf5ac1a3bff965c4093689689041cb6b631e0..28bd2bd0a607a42ab823c4bf7707d2c3982f4b95 100644 (file)
--- a/quarantine.php
+++ b/quarantine.php
@@ -56,6 +56,7 @@
                 } else if ($request == 'delete') {
                     $query[] = "UPDATE msgrcpt SET rs = 'D' WHERE mail_id = '$mail_id'";
                 } else if ($request == 'block') {
+                    $query[] = $recipient;
                 } else {
                     error("Unknown operation [$request]");
                     exit;
@@ -72,14 +73,26 @@
     if ($loggedIn && isset($_GET['id'])) {
         $ids = explode(',', $_GET['id']);
         if ($request == 'block') {
-            // call rest server
+            // /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) {
+            if ($request == 'block') {
+                error("Could not blacklist sender");
+            } else {
                 error("Message not released, contact administrator [$query]");
-                exit;
             }
+            exit;
         }
         header('Location: index.php');
     } else if ($loggedIn && $request == 'purge') {