removed local directory name used for testing.

[squirrelmail.git] / plugins / spamcop / spamcop.php

diff --git a/plugins/spamcop/spamcop.php b/plugins/spamcop/spamcop.php
index 1701fc26ab9efd256f6f5a5da86f471fa732f6b7..0687f9f334db175d27e7b14ac195e24950da73c0 100644 (file)
--- a/plugins/spamcop/spamcop.php
+++ b/plugins/spamcop/spamcop.php
@@ -2,7 +2,7 @@
 /**
  * spamcop.php -- SpamCop plugin -- main page
  *
- * @copyright (c) 1999-2004 The SquirrelMail development team
+ * @copyright (c) 1999-2005 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package plugins
@@ -12,53 +12,12 @@
 /** @ignore */
 define('SM_PATH','../../');
 
- /* SquirrelMail required files. */
+/* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/imap.php');
-
-/**
- * Stores message in attachment directory, when email based reports are used
- * @access private
- */
-function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
-                                      $passed_ent_id='', $imapConnection) {
-    global $attachment_dir, $username;
-
-    $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
-    if (!$passed_ent_id) {
-        $body_a = sqimap_run_command($imapConnection,
-                                    'FETCH '.$passed_id.' RFC822',
-                                    TRUE, $response, $readmessage,
-                                    TRUE);
-    } else {
-        $body_a = sqimap_run_command($imapConnection,
-                                     'FETCH '.$passed_id.' BODY['.$passed_ent_id.']',
-                                     TRUE, $response, $readmessage,TRUE);
-        $message = $message->parent;
-    }
-    if ($response == 'OK') {
-        array_shift($body_a);
-        $body = implode('', $body_a) . "\r\n";
-
-        $localfilename = GenerateRandomString(32, 'FILE', 7);
-        $full_localfilename = "$hashed_attachment_dir/$localfilename";
-        $fp = fopen( $full_localfilename, 'w');
-        fwrite ($fp, $body);
-        fclose($fp);
-
-        /* dirty relative dir fix */
-        if (substr($attachment_dir,0,3) == '../') {
-           $attachment_dir = substr($attachment_dir,3);
-           $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
-        }
-        $full_localfilename = "$hashed_attachment_dir/$localfilename";
-
-        $composeMessage->initAttachment('message/rfc822','email.txt',
-                         $full_localfilename);
-    }
-    return $composeMessage;
-}
-
+include_once(SM_PATH . 'functions/display_messages.php');
+include_once(SM_PATH . 'functions/imap.php');
+/* plugin functions */
+include_once(SM_PATH . 'plugins/spamcop/functions.php');
 
 /* GLOBALS */
 
@@ -97,6 +56,13 @@ if ($js_web) {
   displayPageHeader($color,$mailbox);
 }
 
+/** is spamcop plugin disabled */
+if (! is_plugin_enabled('spamcop')) {
+    error_box(_("Plugin is disabled."),$color);
+    echo "\n</body></html>\n";
+    exit();
+}
+
     $imap_stream = sqimap_login($username, $key, $imapServerAddress,
        $imapPort, 0);
     sqimap_mailbox_select($imap_stream, $mailbox);
@@ -123,7 +89,7 @@ if ($js_web) {
 
 
         $message = sqimap_get_message($imap_stream, $passed_id, $mailbox);
-        $composeMessage = getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
+        $composeMessage = spamcop_getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
                                       $passed_ent_id, $imap_stream);
 
             $compose_messages[$session] = $composeMessage;