From acaa44d26edeac3ee6838eb636e470a085054138 Mon Sep 17 00:00:00 2001 From: Michael Rasmussen Date: Wed, 3 Jun 2015 01:05:07 +0200 Subject: [PATCH] Handle multi action button --- js/checkbox.js | 2 +- quarantine.php | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/js/checkbox.js b/js/checkbox.js index d008803..fab9f77 100644 --- a/js/checkbox.js +++ b/js/checkbox.js @@ -4,7 +4,7 @@ function checkAction() { var ids = ''; var c = document.getElementsByName('action'); for (var i = 0; i < c.length; i++) { - if (c[i].type == 'checkbox' and c[i].checked == true) { + if (c[i].type == 'checkbox' && c[i].checked == true) { if (ids == '') { ids = c[i].value; } else { diff --git a/quarantine.php b/quarantine.php index 9155602..2552995 100644 --- a/quarantine.php +++ b/quarantine.php @@ -14,11 +14,60 @@ echo $util->getFooter(); } + function handleRequest($request, $ids) { + $query = array(); + foreach ($ids as $id) { + $mail_id = urldecode($id); + $mail = unserialize($_SESSION['mailInfo']["$mail_id"]); + $secret_id = $mail->secret_id; + $recipient = $mail->recipient; + echo "$mail_id $secret_id $recipient"; +/* + if ($request == 'release') { + $amavisserver = $CFG->amavisd_db_host; + $policy_port = $CFG->amavis_policy_port; + + $fp = fsockopen($amavisserver, $policy_port, $errno, $errstr, 30); + if (!$fp) { + error("$errstr ($errno)"); + exit; + } + $out = "request=" . $request . "\r\n"; + $out .= "mail_id=" . $mail_id . "\r\n"; + $out .= "recipient=" . $recipient . "\r\n"; + $out .= "secret_id=" . $secret_id . "\r\n\r\n"; + fwrite($fp, $out); + $response = fread($fp, 8192); + fclose($fp); + $response = urldecode($response); + if (! preg_match("/^setreply=250\s+([\d\.]+)\s+(.*)/", $response, $matches)) { + error("Request to release failed [$out][$response]"); + exit; + } + if ($matches[1] != '2.0.0') { + error($matches[2]); + exit; + } + + $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 { + error("Unknown operation [$request]"); + exit; + } +*/ + } + } + $util = Utils::getInstance(); $loggedIn = $util->isLoggedIn(); $request = isset($_GET['op']) ? $_GET['op'] : ''; if ($loggedIn && isset($_GET['id'])) { - $mail_id = urldecode($_GET['id']); + $ids = explode(',', $_GET['id']); + $query = handleRequest($request, $ids); + exit; +/* $mail_id = urldecode($_GET['id']); $mail = unserialize($_SESSION['mailInfo']["$mail_id"]); $secret_id = $mail->secret_id; $recipient = $mail->recipient; @@ -56,7 +105,7 @@ } else { error("Unknown operation [$request]"); exit; - } + }*/ $success = $DB->update($query); if (! $success) { error("Message not released, contact administrator [$query]"); -- 2.39.2