Handle multi action button

diff --git a/index.php b/index.php
index 29ad11e3d0fcb39d7b0ddd5dab47205b10ed0d80..1dc0606ee3fcd1d34a3dc609b579ef757118b472 100644 (file)
--- a/index.php
+++ b/index.php
@@ -92,8 +92,10 @@
         $_SESSION['marked'] = serialize($marked);
         echo '<input class="mail-purge" type="button" value="Purge Mails ('.
               count($marked).')" onclick="javascript: location.href=\'quarantine.php?op=purge\'"/>';
-        echo '<input class="mail-purge" type="button" value="Release checked Mails."
-              onclick="javascript: checkAction();"/>';
+        echo '<input class="mail-purge" type="button" value="Release checked"
+              onclick="javascript: checkAction(\'release\');"/>';
+        echo '<input class="mail-purge" type="button" value="Delete checked"
+              onclick="javascript: checkAction(\'delete\');"/>';
         echo "<p class=\"page-nav\">$first$prev Showing page $pageNum of
               $maxPage pages $next$last</p>";
 

diff --git a/js/checkbox.js b/js/checkbox.js
index d2d516c9663254df9b5d5d3fa80d54a49d0ae1eb..da738c243a077f6c5610540474bc76cf95c89dee 100644 (file)
--- a/js/checkbox.js
+++ b/js/checkbox.js
@@ -1,6 +1,6 @@
 /* vim: set ts=4 tw=4 sw=4 noet: */
 
-function checkAction() {
+function checkAction(action) {
     var ids = '';
     var c = document.getElementsByName('action');
     for (var i = 0; i < c.length; i++) {
@@ -12,6 +12,6 @@ function checkAction() {
             }
         }
     }
-    var url = 'quarantine.php?op=release&id=' + ids;
+    var url = 'quarantine.php?op=' + action + '&id=' + ids;
     location.href=url;
 }

diff --git a/quarantine.php b/quarantine.php
index 25529956e07b1f27dfc677e1975feab895408206..3a7570146494d5e7ae7731a790e4dcbfda593bf5 100644 (file)
--- a/quarantine.php
+++ b/quarantine.php
@@ -21,8 +21,8 @@
             $mail = unserialize($_SESSION['mailInfo']["$mail_id"]);
             $secret_id = $mail->secret_id;
             $recipient = $mail->recipient;
-            echo "$mail_id $secret_id $recipient";
-/*
+            //echo "$mail_id $secret_id $recipient";
+
             if ($request == 'release') {
                 $amavisserver = $CFG->amavisd_db_host;
                 $policy_port = $CFG->amavis_policy_port;
@@ -56,8 +56,9 @@
                 error("Unknown operation [$request]");
                 exit;
             }
-*/
         }
+
+        return $query;
     }
 
     $util = Utils::getInstance();
@@ -66,8 +67,8 @@
     if ($loggedIn && isset($_GET['id'])) {
         $ids = explode(',', $_GET['id']);
         $query = handleRequest($request, $ids);
-        exit;
-/*        $mail_id = urldecode($_GET['id']);
+/*        exit;
+        $mail_id = urldecode($_GET['id']);
         $mail = unserialize($_SESSION['mailInfo']["$mail_id"]);
         $secret_id = $mail->secret_id;
         $recipient = $mail->recipient;
@@ -106,6 +107,8 @@
             error("Unknown operation [$request]");
             exit;
         }*/
+        print_r($query);
+        exit;
         $success = $DB->update($query);
         if (! $success) {
             error("Message not released, contact administrator [$query]");