X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Fspamcop%2Fspamcop.php;h=83f57230348b034b0c5f8a36e424422f4bc5bb97;hb=0f610dca6fd52a148e290f79cdfcfc572998b475;hp=704b61ef57f02c5982ba1da24759aaec64d6b290;hpb=9538cd4c6f9026a3bd661a2fd8a029e3b9152ad6;p=squirrelmail.git

diff --git a/plugins/spamcop/spamcop.php b/plugins/spamcop/spamcop.php
index 704b61ef..83f57230 100644
--- a/plugins/spamcop/spamcop.php
+++ b/plugins/spamcop/spamcop.php
@@ -1,37 +1,42 @@
 <?php
-   /** 
-    **  spamcop.php -- SpamCop plugin           
-    **
-    **  Copyright (c) 1999-2002 The SquirrelMail development team
-    **  Licensed under the GNU GPL. For full terms see the file COPYING.
-    **  
-    **  $Id$                                                         
-    **/
-
+/** 
+ * spamcop.php -- SpamCop plugin -- main page
+ *
+ * @copyright (c) 1999-2004 The SquirrelMail development team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package plugins
+ * @subpackage spamcop
+ */
+
+/** @ignore */
 define('SM_PATH','../../');
 
  /* SquirrelMail required files. */
 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
+ * @access private
+ */
 function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id, 
                                       $passed_ent_id='', $imapConnection) {
-    global $attachments, $attachment_dir, $username, $data_dir, $uid_support;
-    
+    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',
                                     TRUE, $response, $readmessage, 
-                                    $uid_support);
+                                    TRUE);
     } else {
         $body_a = sqimap_run_command($imapConnection, 
                                      'FETCH '.$passed_id.' BODY['.$passed_ent_id.']',
-                                     TRUE, $response, $readmessage, $uid_support);
+                                     TRUE, $response, $readmessage,TRUE);
         $message = $message->parent;
     }
-    if ($response = 'OK') {
-        $subject = encodeHeader($message->rfc822_header->subject);
+    if ($response == 'OK') {
         array_shift($body_a);
         $body = implode('', $body_a) . "\r\n";
                 
@@ -55,36 +60,42 @@ function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
 }
 
 
-    /* GLOBALS */
-    $username = $_SESSION['username'];
-    $key  = $_COOKIE['key'];
-    $onetimepad = $_SESSION['onetimepad'];
-    $mailbox = $_GET['mailbox'];
-    $passed_id = $_GET['passed_id'];
-    if (isset($_GET['startMessage'])) {
-	$startMessage = $_GET['startMessage'];
-    } else {
-	$startMessage = 1;
-    }
-    if (isset($_GET['passed_ent_id'])) {
-	$passed_ent_id = $_GET['passed_ent_id'];
-    } else {
-	$passed_ent_id = '';
-    }
-    if ( isset($_SESSION['compose_messages']) ) {
-        $compose_messages = &$_SESSION['compose_messages'];
-    }
+/* GLOBALS */
 
-    if ( isset($_SESSION['composesession']) ) {
-        $composesession = $_SESSION['composesession'];
-    } else {
-        $composesession = 0;
-        sqsession_register($composesession, 'composesession');
-    }
-    /* END GLOBALS */
+sqgetGlobalVar('username', $username, SQ_SESSION);
+sqgetGlobalVar('key',      $key,      SQ_COOKIE);
+sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
 
-    
-    displayPageHeader($color, $mailbox);
+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 = 0;
+}
+if (! sqgetGlobalVar('js_web', $js_web, SQ_GET) ) {
+    $js_web = 0;
+}
+
+sqgetGlobalVar('compose_messages', $compose_messages, SQ_SESSION);
+
+if(! sqgetGlobalVar('composesession', $composesession, SQ_SESSION) ) {
+    $composesession = 0;
+    sqsession_register($composesession, 'composesession');
+}
+/* END GLOBALS */
+
+// 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 "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\">\n";
+} else {
+  displayPageHeader($color,$mailbox);
+}
 
     $imap_stream = sqimap_login($username, $key, $imapServerAddress, 
        $imapPort, 0);
@@ -113,7 +124,7 @@ function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
 
         $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');
@@ -126,82 +137,74 @@ function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
           $HowItLooks .= '<' . $em . '>';
      }
 
-?>
 
-<p>Sending this spam report will give you back a reply with URLs that you
-can click on to properly report this spam message to the proper authorities.
-This is a free service.  By pressing the "Send Spam Report" button, you
-agree to follow SpamCop's rules/terms of service/etc.</p>
+echo "<p>";
+echo _("Sending this spam report will give you back a reply with URLs that you can click on to properly report this spam message to the proper authorities. This is a free service. By pressing the \"Send Spam Report\" button, you agree to follow SpamCop's rules/terms of service/etc.");
+echo "</p>";
+
+?>
 
-<table align=center width="75%" border=0 cellpadding=0 cellspacing=0>
+<table align="center" width="75%" border="0" cellpadding="0" cellspacing="0">
 <tr>
-<td align=left valign=top>
-<?PHP if (isset($js_web) && $js_web) {
-   ?><form method=post action="javascript:return false">
-  <input type=button value="Close Window" 
-  onClick="window.close(); return true;">
-   <?PHP
+<td align="left" valign="top">
+<?php if (isset($js_web) && $js_web) {
+  echo '<form method="post" action="javascript:return false">';
+  echo '<input type="button" value="' . _("Close Window") . "\" onClick=\"window.close(); return true;\" />\n";
 } else {
-   ?><form method=post action="../../src/right_main.php">
-  <input type=hidden name="mailbox" value="<?PHP echo
-     htmlspecialchars($mailbox) ?>">
-  <input type=hidden name="startMessage" value="<?PHP echo
-     htmlspecialchars($startMessage) ?>">
-  <input type=submit value="Cancel / Done">
-   <?PHP
+   ?><form method="post" action="../../src/right_main.php">
+  <input type="hidden" name="mailbox" value="<?php echo htmlspecialchars($mailbox) ?>" />
+  <input type="hidden" name="startMessage" value="<?php echo htmlspecialchars($startMessage) ?>" />
+<?php
+  echo '<input type="submit" value="' . _("Cancel / Done") . "\" />";
 }
   ?></form>
 </td>
-<td align=right valign=top>
-<?PHP if ($spamcop_method == 'thorough_email' ||
+<td align="right" valign="top">
+<?php if ($spamcop_method == 'thorough_email' ||
           $spamcop_method == 'quick_email') {
    if ($spamcop_method == 'thorough_email')
       $report_email = 'submit.' . $spamcop_id . '@spam.spamcop.net';
    else
       $report_email = 'quick.' . $spamcop_id . '@spam.spamcop.net';
    $form_action = SM_PATH . 'src/compose.php';
-?>  <form method=post action="<?PHP echo $form_action?>">
-  <input type=hidden name="mailbox" value="<?PHP echo
-     htmlspecialchars($mailbox) ?>">
-  <input type=hidden name="spamcop_is_composing" value="<?PHP echo
-     htmlspecialchars($passed_id) ?>">
-  <input type=hidden name="send_to" value="<?PHP echo $report_email?>">
-  <input type=hidden name="send_to_cc" value="">
-  <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 {
-   $sid = sqimap_session_id($uid_support);
-   fputs($imap_stream, $sid.' FETCH ' . $passed_id . ' RFC822' . "\r\n");
-    
-   $read = sqimap_read_data($imap_stream, $sid, true, $response, $message);
-   array_shift($read);
-
-   $Message = implode('', $read);
-   if (strlen($Message) > 50000) {
+?>  <form method="post" action="<?php echo $form_action?>">
+  <input type="hidden" name="mailbox" value="<?php echo htmlspecialchars($mailbox) ?>" />
+  <input type="hidden" name="spamcop_is_composing" value="<?php echo htmlspecialchars($passed_id) ?>" />
+  <input type="hidden" name="send_to" value="<?php echo htmlspecialchars($report_email)?>" />
+  <input type="hidden" name="subject" value="reply anyway" />
+  <input type="hidden" name="identity" value="0" />
+  <input type="hidden" name="session" value="<?php echo $session?>" />
+<?php
+  echo '<input type="submit" name="send" value="' . _("Send Spam Report") . "\" />\n";
+} else {
+   $spam_message = mime_fetch_body ($imap_stream, $passed_id, $passed_ent_id, 50000);
+
+   if (strlen($spam_message) == 50000) {
       $Warning = "\n[truncated by SpamCop]\n";
-      $Message = substr($Message, 0, 50000 - strlen($Warning)) . $Warning;
+      $spam_message = substr($spam_message, 0, 50000 - strlen($Warning)) . $Warning;
+   }
+   if ($spamcop_type=='member') {
+     $action_url="http://members.spamcop.net/sc";
+   } else {
+     $action_url="http://www.spamcop.net/sc";
    }
    if (isset($js_web) && $js_web) {
-?>  <form method=post action="http://spamcop.net/sc" name="submitspam"
-    enctype="multipart/form-data"><?PHP
+     echo "<form method=\"post\" action=\"$action_url\" name=\"submitspam\"".
+       " enctype=\"multipart/form-data\">\n";
    } else {
-?>  <form method=post action="http://spamcop.net/sc" name="submitspam"
-    enctype="multipart/form-data" target="_blank"><?PHP
+     echo "<form method=\"post\" action=\"$action_url\" name=\"submitspam\"".
+       " enctype=\"multipart/form-data\" target=\"_blank\">\n";
    } ?>
-  <input type=hidden name=action value=submit>
-  <input type=hidden name=oldverbose value=1>
-  <input type=hidden name=code value="<?PHP echo $spamcop_id ?>">
-  <input type=hidden name=spam value="<?PHP
-          echo htmlspecialchars($Message);
-  ?>">
-  <input type=submit name="x1" value="Send Spam Report">
-<?PHP }
+  <input type="hidden" name="action" value="submit" />
+  <input type="hidden" name="oldverbose" value="1" />
+  <input type="hidden" name="code" value="<?php echo htmlspecialchars($spamcop_id) ?>" />
+  <input type="hidden" name="spam" value="<?php echo htmlspecialchars($spam_message); ?>" />
+    <?php
+	echo '<input type="submit" name="x1" value="' . _("Send Spam Report") . "\" />\n";
+    }
 ?>  </form>
 </td>
 </tr>
 </table>
-  </body>
+</body>
 </html>