X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fspamcop%2Fspamcop.php;h=ddba3220218f955325f1c6c6f0e7d9ad9a5666c4;hp=eea99e9bfa8b36b865a4e9c85fa2458de763de12;hb=8d6a115b0ef06dbcf9b149ba2509208f09b3a2ab;hpb=430be822051ff6c319d67cbd205fbca2d8c2b925

diff --git a/plugins/spamcop/spamcop.php b/plugins/spamcop/spamcop.php
index eea99e9b..ddba3220 100644
--- a/plugins/spamcop/spamcop.php
+++ b/plugins/spamcop/spamcop.php
@@ -1,8 +1,10 @@
 <?php
 
-    chdir('..');
-    include_once ('../src/validate.php');
-    include_once ('../functions/imap.php');
+define('SM_PATH','../../');
+
+ /* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/imap.php');
     
     displayPageHeader($color, $mailbox);
 
@@ -10,7 +12,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' ||