Skip to content

Default fallback for mail clients that don't set content-name #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
j42 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Default fallback for mail clients that don't set content-name #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d48b7d
Mailparser fix
j42 Sep 21, 2014
85a4117
Default fallback for mail clients that don't set content-name
j42 Sep 21, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions lib/MimeMailParser/Parser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

/**
* Fast Mime Mail parser Class using PHP's MailParse Extension
*
*
* @author gabe@fijiwebdesign.com
* @url http://www.fijiwebdesign.com/
* @license http://creativecommons.org/licenses/by-sa/3.0/us/
Expand Down Expand Up @@ -42,7 +42,7 @@ class Parser

/**
* Inialize some stuff
* @return
* @return
*/
public function __construct()
{
Expand Down Expand Up @@ -119,7 +119,7 @@ public function setStream($stream)

/**
* Set the email text
* @return Object MimeMailParser Instance
* @return Object MimeMailParser Instance
* @param $data String
*/
public function setText($data)
Expand Down Expand Up @@ -254,8 +254,10 @@ public function getAttachments()
foreach ($this->parts as $part) {
$disposition = $this->getPartContentDisposition($part);
if (in_array($disposition, $dispositions)) {
$name = (!empty($part['disposition-filename'])) ? $part['disposition-filename'] : false;
$name = (!$name && !empty($part['content-name'])) ? $part['content-name'] : 'File.zip';
$attachments[] = new Attachment(
!empty($part['disposition-filename']) ? $part['disposition-filename'] : $part['content-name'],
$name,
$this->getPartContentType($part),
$this->getAttachmentStream($part),
$disposition,
Expand Down