uid fix

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

diff --git a/plugins/spamcop/spamcop.php b/plugins/spamcop/spamcop.php
index 3171109fd1232453837a6813bc450a7c441e66e2..f43543b0ad4419b5eb14dea9ca481b1b94342c0c 100644 (file)
--- a/plugins/spamcop/spamcop.php
+++ b/plugins/spamcop/spamcop.php
@@ -1,19 +1,20 @@
 <?php
 
 <?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);
 
     $imap_stream = sqimap_login($username, $key, $imapServerAddress, 
        $imapPort, 0);
     sqimap_mailbox_select($imap_stream, $mailbox);
     
     displayPageHeader($color, $mailbox);
 
     $imap_stream = sqimap_login($username, $key, $imapServerAddress, 
        $imapPort, 0);
     sqimap_mailbox_select($imap_stream, $mailbox);

-    fputs($imap_stream, 'a010 FETCH ' . $passed_id . ' RFC822' . "\r\n");
-    $sid = 'a010';
-    if ($uid_support) $sid .= ' UID';
+    $sid = sqimap_session_id($uid_support)
+    fputs($imap_stream, '$sid FETCH ' . $passed_id . ' RFC822' . "\r\n");

     
     

-    $read = sqimap_read_data($imap_stream, 'a010', true, $response, $message);
+    $read = sqimap_read_data($imap_stream, $sid, true, $response, $message);

     array_shift($read);
 
     if ($spamcop_method == 'quick_email' || 
     array_shift($read);
 
     if ($spamcop_method == 'quick_email' ||