X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fspamcop%2Fspamcop.php;h=a48d6e32923026e490a2c9add0a00e119fee57a0;hp=1822da77ccec432ac90ac0ecdf0d2c48a4724ce8;hb=7afb9a754fbf327f2eed78d8a6c43ee6bd16695c;hpb=5121598d71240064093fd73f004a28dd62d95df5

diff --git a/plugins/spamcop/spamcop.php b/plugins/spamcop/spamcop.php
index 1822da77..a48d6e32 100644
--- 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,12 +15,24 @@
        $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' || 
         $spamcop_method == 'thorough_email') {
        // Use email-based reporting -- save as an attachment
+       if(!isset($composesession)) {
+        $composesession = 0;
+        session_register('composesession');
+       }
+       if (!isset($session)) {
+         $session = "$composesession" +1;
+           $composesession = $session;
+       }
+
        if (!isset($attachments)) {
           $attachments = array();
           session_register('attachments');
@@ -33,6 +50,7 @@
        $newAttachment['localfilename'] = $file;
        $newAttachment['remotefilename'] = 'email.txt';
        $newAttachment['type'] = 'message/rfc822';
+       $newAttachment['session'] = $session;
        $fp = fopen($attachment_dir . $file, 'w');
        foreach ($read as $line) {
           fputs($fp, $line);
@@ -90,6 +108,7 @@ agree to follow SpamCop's rules/terms of service/etc.</p>
   <input type=hidden name="send_to_bcc" value="">
   <input type=hidden name="subject" value="reply anyway">
   <input type=hidden name="identity" value="default">
+  <input type=hidden name="session" value="<?PHP echo $session?>">
   <input type=submit name="send" value="Send Spam Report">
 <?PHP } else {
    $Message = implode('', $read);