Commit 73225d70 authored by Dane Powell's avatar Dane Powell
Browse files

Issue #1312694 by Dane Powell, laurent.lemercier, kloewer: Added cleaning of... 

Issue #1312694 by Dane Powell, laurent.lemercier, kloewer: Added cleaning of ISO-8859-1 encoding in messages.
parent 81094b19

CHANGELOG.txt

+1 −0
Changes for CHANGELOG.txt: 1 added line, 0 removed lines.
Original line number Diff line number Diff line 
Mailhandler 7.x-2.x, 2011-10-16

-------------------------------

#1312694 by Dane Powell, laurent.lemercier, kloewer: Added cleaning of ISO-8859-1 encoding in messages.

#1307470 by andremolnar: Removed unused MIME parts mapping source.

#1283198 by Dane Powell: Fixed broken mailbox exports.

#1260106 by jeffvanh, Dane Powell: Added option to ignore failed authentication.

plugins/commands_plugin/MailhandlerCommandsFiles.class.php

+1 −4
Changes for plugins/commands_plugin/MailhandlerCommandsFiles.class.php: 1 added line, 4 removed lines.
Original line number Diff line number Diff line
@@ -17,10 +17,7 @@ class MailhandlerCommandsFiles extends MailhandlerCommands { 
      // We only want to save real attachments, like images and files.

      if ($attachment->filename !== 'unnamed_attachment') {

        $destination = 'temporary://';

        $filename = $attachment->filename;

        if (strpos($filename, 'ISO-8859-1') !== FALSE) {

          $filename = imap_utf8($filename);

        }

        $filename = mb_decode_mimeheader($attachment->filename);

        $file = file_save_data($attachment->data, $destination . $filename);

        $file->status = 0;

        drupal_write_record('file_managed', $file, 'fid');

plugins/commands_plugin/MailhandlerCommandsHeaders.class.php

+5 −0
Changes for plugins/commands_plugin/MailhandlerCommandsHeaders.class.php: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -15,10 +15,15 @@ class MailhandlerCommandsHeaders extends MailhandlerCommands { 
    foreach ($parts as $key => $value) {

      // Some keys are already taken, so do not overwrite them.

      if (!in_array($key, array('header', 'origbody', 'mimeparts', 'mailbox', 'attachments'))) {

        if (in_array($key, array('Subject', 'subject'))) {

	  $message[$key] = mb_decode_mimeheader($value);	

        }

        else {

	  $message[$key] = $value;

	} 

      }

    }

  }



  function getMappingSources() {

    $sources = array();