X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Fspamcop%2Ffunctions.php;h=c6ffa93828e78654e403cda60ff455fe26f26b00;hb=30460a05016c7e066ad7b28df7788539e4054a99;hp=a36ac3ceed0575143ef9002b5ff704f3184ab440;hpb=6c99d1de81366bceab6c9d6cf12179eedc81f9bc;p=squirrelmail.git
diff --git a/plugins/spamcop/functions.php b/plugins/spamcop/functions.php
index a36ac3ce..c6ffa938 100644
--- a/plugins/spamcop/functions.php
+++ b/plugins/spamcop/functions.php
@@ -3,7 +3,7 @@
/**
* SpamCop plugin - functions
*
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright 1999-2009 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package plugins
@@ -59,14 +59,14 @@ function spamcop_load_function() {
* @since 1.5.1
* @access private
*/
-function spamcop_show_link_function() {
- global $spamcop_enabled, $spamcop_method, $spamcop_quick_report,$javascript_on;
+function spamcop_show_link_function(&$links) {
+ global $spamcop_enabled, $spamcop_method, $spamcop_quick_report;
if (! $spamcop_enabled)
return;
/* GLOBALS */
- sqgetGlobalVar('passed_id', $passed_id, SQ_FORM);
+ sqgetGlobalVar('passed_id', $passed_id, SQ_FORM, NULL, SQ_TYPE_BIGINT);
sqgetGlobalVar('passed_ent_id',$passed_ent_id,SQ_FORM);
sqgetGlobalVar('mailbox', $mailbox, SQ_FORM);
if ( sqgetGlobalVar('startMessage', $startMessage, SQ_FORM) ) {
@@ -79,8 +79,6 @@ function spamcop_show_link_function() {
$passed_ent_id = 0;
}
- echo "
\n";
-
/*
Catch situation when user uses quick_email and does not update
preferences. User gets web_form link. If prefs are set to
@@ -90,19 +88,24 @@ function spamcop_show_link_function() {
$spamcop_method = 'web_form';
}
- // Javascript is used only in web based reporting
- // don't insert javascript if javascript is disabled
- if ($spamcop_method == 'web_form' && $javascript_on) {
-?>
-
-
+// document.write('');
+//document.write("");
+//document.write("");
+//
+
+
+ $url = '../plugins/spamcop/spamcop.php?passed_id=' . urlencode($passed_id) .
+ '&mailbox=' . urlencode($mailbox) . '&startMessage=' . urlencode($startMessage) .
+ '&passed_ent_id=' . urlencode($passed_ent_id);
+ if ( $spamcop_method == 'web_form' && checkForJavascript() ) {
+ $url .= '&js_web=1';
}
+
+ $links[] = array ( 'URL' => $url,
+ 'Text' => _("Report as Spam")
+ );
}
/**
@@ -177,9 +180,7 @@ function spamcop_enable_disable($option,$disable_action,$enable_action) {
*/
function spamcop_getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
$passed_ent_id='', $imapConnection) {
- global $attachment_dir, $username;
- $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
if (!$passed_ent_id) {
$body_a = sqimap_run_command($imapConnection,
'FETCH '.$passed_id.' RFC822',
@@ -195,21 +196,12 @@ function spamcop_getMessage_RFC822_Attachment($message, $composeMessage, $passed
array_shift($body_a);
$body = implode('', $body_a) . "\r\n";
- $localfilename = GenerateRandomString(32, 'FILE', 7);
- $full_localfilename = "$hashed_attachment_dir/$localfilename";
- $fp = fopen( $full_localfilename, 'w');
+ $filename = sq_get_attach_tempfile();
+ $fp = fopen($filename, 'wb');
fwrite ($fp, $body);
fclose($fp);
-
- /* dirty relative dir fix */
- if (substr($attachment_dir,0,3) == '../') {
- $attachment_dir = substr($attachment_dir,3);
- $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
- }
- $full_localfilename = "$hashed_attachment_dir/$localfilename";
-
$composeMessage->initAttachment('message/rfc822','email.txt',
- $full_localfilename);
+ $filename);
}
return $composeMessage;
}