From 2b42190dd030b1e6ae926ca5339a5533e64a2824 Mon Sep 17 00:00:00 2001 From: tokul Date: Fri, 15 Jul 2005 11:08:28 +0000 Subject: [PATCH] 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 --- plugins/spamcop/functions.php | 3 ++- plugins/spamcop/spamcop.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/spamcop/functions.php b/plugins/spamcop/functions.php index 2a78c795..1baea7f3 100644 --- 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 15a23fc2..0687f9f3 100644 --- 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; -- 2.25.1