almost forgot: SMPATH fixes from Paul BORKED spamcop

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

diff --git a/plugins/spamcop/spamcop.php b/plugins/spamcop/spamcop.php
index eea99e9bfa8b36b865a4e9c85fa2458de763de12..a48d6e32923026e490a2c9add0a00e119fee57a0 100644 (file)
--- a/plugins/spamcop/spamcop.php
+++ b/plugins/spamcop/spamcop.php
@@ -1,8 +1,13 @@
 <?php
 
     chdir('..');
-    include_once ('../src/validate.php');
-    include_once ('../functions/imap.php');
+    chdir('..');
+    define('SM_PATH','../');
+
+     /* SquirrelMail required files. */
+    require_once(SM_PATH . 'include/validate.php');
+
+    include_once(SM_PATH . 'functions/imap.php');
     
     displayPageHeader($color, $mailbox);
 
@@ -10,7 +15,10 @@
        $imapPort, 0);
     sqimap_mailbox_select($imap_stream, $mailbox);
     fputs($imap_stream, 'a010 FETCH ' . $passed_id . ' RFC822' . "\r\n");
-    $read = sqimap_read_data($imap_stream, 'a010', true, $response, $message);
+    $sid = 'a010';
+    if ($uid_support) $sid .= ' UID';
+    
+    $read = sqimap_read_data($imap_stream, $sid, true, $response, $message);
     array_shift($read);
 
     if ($spamcop_method == 'quick_email' ||