duplicate function. fix use first. compare functions later.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@9780 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/plugins/spamcop/functions.php b/plugins/spamcop/functions.php
index 2a78c7955e21e88471074bfee5c525380d97fbd2..1baea7f32e1f825c37850d15ccc50e48c1333497 100644 (file)
--- a/plugins/spamcop/functions.php
+++ b/plugins/spamcop/functions.php
@@ -173,8 +173,9 @@ function spamcop_enable_disable($option,$disable_action,$enable_action) {
 /**
  * Stores message in attachment directory, when email based reports are used
  * @access private
+ * @todo Duplicate code in src/compose.php
  */
-function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
+function spamcop_getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
                                       $passed_ent_id='', $imapConnection) {
     global $attachment_dir, $username;
 

diff --git a/plugins/spamcop/spamcop.php b/plugins/spamcop/spamcop.php
index 15a23fc27d333c30bbd02ac53cf1b289b6f0bba7..0687f9f334db175d27e7b14ac195e24950da73c0 100644 (file)
--- a/plugins/spamcop/spamcop.php
+++ b/plugins/spamcop/spamcop.php
@@ -89,7 +89,7 @@ if (! is_plugin_enabled('spamcop')) {
 
 
         $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;