From 7aa4e6f8915268b310482320a6b6425c5498bf81 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Fri, 6 Sep 2013 16:35:53 +0000
Subject: [PATCH] Oops. No need to fetch attachments twice
---
include/class.mailfetch.php | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/include/class.mailfetch.php b/include/class.mailfetch.php
index 604950279..9f0ae3b1e 100644
--- a/include/class.mailfetch.php
+++ b/include/class.mailfetch.php
@@ -424,24 +424,6 @@ class MailFetcher {
$errors=array();
- // Fetch attachments if any.
- if($ost->getConfig()->allowEmailAttachments()
- && ($struct = imap_fetchstructure($this->mbox, $mid))
- && ($attachments=$this->getAttachments($struct))) {
-
- $vars['attachments'] = array();
- foreach($attachments as $a ) {
- $file = array('name' => $a['name'], 'type' => $a['type']);
-
- //Check the file type
- if(!$ost->isFileTypeAllowed($file))
- $file['error'] = 'Invalid file type (ext) for '.Format::htmlchars($file['name']);
- else //only fetch the body if necessary TODO: Make it a callback.
- $file['data'] = $this->decode(imap_fetchbody($this->mbox, $mid, $a['index']), $a['encoding']);
- $vars['attachments'][] = $file;
- }
- }
-
if (($thread = ThreadEntry::lookupByEmailHeaders($vars))
&& ($message = $thread->postEmail($vars))) {
if ($message === true)
--
GitLab