Center summary text

[qtadmin.git] / quarantine.php

diff --git a/quarantine.php b/quarantine.php
index 3a7570146494d5e7ae7731a790e4dcbfda593bf5..031a416d69e4796411db8fd511b0509b37524e1b 100644 (file)
--- a/quarantine.php
+++ b/quarantine.php
@@ -5,7 +5,7 @@
     require_once $CFG->root . 'lib/utils.inc.php';
 
     function error($error) {
-        $util = Utils::getInstance();
+        $util = new Utils;
         $util->setHeading("Error");
         echo $util->getHeader();
         echo $util->getHeading();
@@ -15,13 +15,14 @@
     }
 
     function handleRequest($request, $ids) {
+        global $CFG;
+
         $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;
@@ -61,54 +62,12 @@
         return $query;
     }
 
-    $util = Utils::getInstance();
+    $util = new Utils;
     $loggedIn = $util->isLoggedIn();
     $request = isset($_GET['op']) ? $_GET['op'] : '';
     if ($loggedIn && isset($_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;
-
-        $query = array();
-        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;
-        }*/
-        print_r($query);
-        exit;
         $success = $DB->update($query);
         if (! $success) {
             error("Message not released, contact administrator [$query]");