← Back to branch summary

~siretart/+junk/bug.306536

« back to all changes in this revision

Viewing changes to src/read_body.php

  • Committer: Bazaar Package Importer
  • Author(s): Thijs Kinkhorst
  • Date: 2008-11-01 06:26:55 UTC
  • mfrom: (1.1.7 squirrelmail-gutsy-upstream)
  • Revision ID: jamesw@ubuntu.com-20081101062655-yaax9buhme4ukmrp
Tags: ubuntu-2:1.4.10a-1
* New upstream security release.
  - Fixes cross site scripting in the HTML filter [CVE-2007-1262]
  - Tweaks SMTP error message display (Closes: #403705).
  - Fixes address duplication on reply-all (Closes: #408242).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/read_body.php
6
6
 * This file is used for reading the msgs array and displaying
7
7
 * the resulting emails in the right frame.
8
8
 *
9
 
 * @copyright © 1999-2006 The SquirrelMail Project Team
 
9
 * @copyright © 1999-2007 The SquirrelMail Project Team
10
10
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
11
 
 * @version $Id: read_body.php,v 1.283.2.31 2006/08/01 05:47:32 tokul Exp $
 
11
 * @version $Id: read_body.php 12285 2007-02-27 19:07:02Z kink $
12
12
 * @package squirrelmail
13
13
 */
14
14
 
218
218
    }
219
219
 
220
220
    // part 1 (RFC2298)
221
 
    $senton = getLongDateString( $header->date );
 
221
    $senton = getLongDateString( $header->date, $header->date_unparsed );
222
222
    $to_array = $header->to;
223
223
    $to = '';
224
224
    foreach ($to_array as $line) {
326
326
        $success = $deliver->finalizeStream($stream);
327
327
    }
328
328
    if (!$success) {
329
 
        $msg  = $deliver->dlv_msg . '<br />' .
330
 
                _("Server replied:") . ' ' . $deliver->dlv_ret_nr . ' '.
331
 
                $deliver->dlv_server_msg;
 
329
        $msg  = _("Message not sent.") .' '.  _("Server replied:") .
 
330
            "\n<blockquote>\n" . $deliver->dlv_msg . '<br />' .
 
331
            $deliver->dlv_ret_nr . ' ' .
 
332
            $deliver->dlv_server_msg . "</blockquote>\n\n";
332
333
        require_once(SM_PATH . 'functions/display_messages.php');
333
334
        plain_error_message($msg, $color);
334
335
    } else {
422
423
        }
423
424
    }
424
425
    $env[_("From")] = decodeHeader($from_name);
425
 
    $env[_("Date")] = getLongDateString($header->date);
 
426
    $env[_("Date")] = getLongDateString($header->date, $header->date_unparsed);
426
427
    $env[_("To")] = formatRecipientString($header->to, "to");
427
428
    $env[_("Cc")] = formatRecipientString($header->cc, "cc");
428
429
    $env[_("Bcc")] = formatRecipientString($header->bcc, "bcc");
443
444
                          $message->is_deleted ||
444
445
                          $passed_ent_id)) {
445
446
                        $mdn_url = $PHP_SELF;
446
 
                        $mdn_url = set_url_var($PHP_SELF, 'mailbox', urlencode($mailbox));
447
 
                        $mdn_url = set_url_var($PHP_SELF, 'passed_id', $passed_id);
448
 
                        $mdn_url = set_url_var($PHP_SELF, 'passed_ent_id', $passed_ent_id);
449
 
                        $mdn_url = set_url_var($PHP_SELF, 'sendreceipt', 1);
 
447
                        $mdn_url = set_url_var($mdn_url, 'mailbox', urlencode($mailbox));
 
448
                        $mdn_url = set_url_var($mdn_url, 'passed_id', $passed_id);
 
449
                        $mdn_url = set_url_var($mdn_url, 'passed_ent_id', $passed_ent_id);
 
450
                        $mdn_url = set_url_var($mdn_url, 'sendreceipt', 1);
450
451
                        if ($FirstTimeSee && $javascript_on) {
451
452
                            $script  = '<script language="JavaScript" type="text/javascript">' . "\n";
452
453
                            $script .= '<!--'. "\n";