X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fspamcop%2Fspamcop.php;h=02456ff5d637e40ed3300fb03cdee774cbc344eb;hb=9a422982f7133d981fe505f468b1f8c5aca44720;hp=c7b1397c6d20b988fe47a28f8d45d2f9c0dbfe49;hpb=a75e70b1b5fb3a111e84cf658cc6937a8e97dc2c;p=squirrelmail.git
diff --git a/plugins/spamcop/spamcop.php b/plugins/spamcop/spamcop.php
index c7b1397c..02456ff5 100644
--- a/plugins/spamcop/spamcop.php
+++ b/plugins/spamcop/spamcop.php
@@ -17,10 +17,13 @@ define('SM_PATH','../../');
require_once(SM_PATH . 'include/validate.php');
require_once(SM_PATH . 'functions/imap.php');
+/**
+ * Stores message in attachment directory, when email based reports are used
+ */
function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
$passed_ent_id='', $imapConnection) {
global $attachments, $attachment_dir, $username, $data_dir, $uid_support;
-
+
$hashed_attachment_dir = getHashedDir($username, $attachment_dir);
if (!$passed_ent_id) {
$body_a = sqimap_run_command($imapConnection,
@@ -66,12 +69,16 @@ sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
sqgetGlobalVar('passed_id', $passed_id, SQ_GET);
+sqgetGlobalVar('js_web', $js_web, SQ_GET);
if (! sqgetGlobalVar('startMessage', $startMessage, SQ_GET) ) {
$startMessage = 1;
}
if (! sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET) ) {
- $passed_ent_id = '';
+ $passed_ent_id = 0;
+}
+if (! sqgetGlobalVar('js_web', $js_web, SQ_GET) ) {
+ $js_web = 0;
}
sqgetGlobalVar('compose_messages', $compose_messages, SQ_SESSION);
@@ -82,8 +89,14 @@ if(! sqgetGlobalVar('composesession', $composesession, SQ_SESSION) ) {
}
/* END GLOBALS */
-
- displayPageHeader($color, $mailbox);
+// js_web variable is 1 only when link opens web based report page in new window
+// and in new window menu line or extra javascript code is not needed.
+if ($js_web) {
+ displayHTMLHeader('SpamCop reporting');
+ echo "\n";
+} else {
+ displayPageHeader($color,$mailbox);
+}
$imap_stream = sqimap_login($username, $key, $imapServerAddress,
$imapPort, 0);
@@ -112,7 +125,7 @@ if(! sqgetGlobalVar('composesession', $composesession, SQ_SESSION) ) {
$message = sqimap_get_message($imap_stream, $passed_id, $mailbox);
$composeMessage = getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
- $passed_ent_id='', $imap_stream);
+ $passed_ent_id, $imap_stream);
$compose_messages[$session] = $composeMessage;
sqsession_register($compose_messages, 'compose_messages');
@@ -166,18 +179,23 @@ echo "";