X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FMailing%2FMailStore%2FMaildir.php;h=7ce192a40310b96bcc328b7f52c583bc25c365ae;hb=6c552737d30d31187eddb3bea10dafd720bf2a5e;hp=9a58bf018413d218cf27fbfd937f09ada740dc81;hpb=90c8230ea5763fc14fadddbc672af05942947ca6;p=civicrm-core.git diff --git a/CRM/Mailing/MailStore/Maildir.php b/CRM/Mailing/MailStore/Maildir.php index 9a58bf0184..7ce192a403 100644 --- a/CRM/Mailing/MailStore/Maildir.php +++ b/CRM/Mailing/MailStore/Maildir.php @@ -23,7 +23,7 @@ | GNU Affero General Public License or the licensing of CiviCRM, | | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ -*/ + */ /** * @@ -52,8 +52,18 @@ class CRM_Mailing_MailStore_Maildir extends CRM_Mailing_MailStore { public function __construct($dir) { $this->_dir = $dir; - $this->_ignored = $this->maildir(implode(DIRECTORY_SEPARATOR, array('CiviMail.ignored', date('Y'), date('m'), date('d')))); - $this->_processed = $this->maildir(implode(DIRECTORY_SEPARATOR, array('CiviMail.processed', date('Y'), date('m'), date('d')))); + $this->_ignored = $this->maildir(implode(DIRECTORY_SEPARATOR, array( + 'CiviMail.ignored', + date('Y'), + date('m'), + date('d'), + ))); + $this->_processed = $this->maildir(implode(DIRECTORY_SEPARATOR, array( + 'CiviMail.processed', + date('Y'), + date('m'), + date('d'), + ))); } /** @@ -63,16 +73,19 @@ class CRM_Mailing_MailStore_Maildir extends CRM_Mailing_MailStore { * @param int $count * Number of messages to fetch FIXME: ignored in CiviCRM 2.2 (assumed to be 0, i.e., fetch all). * - * @return array array of ezcMail objects + * @return array + * array of ezcMail objects */ public function fetchNext($count = 0) { $mails = array(); - $parser = new ezcMailParser; + $parser = new ezcMailParser(); //set property text attachment as file CRM-5408 $parser->options->parseTextAttachmentsAsFiles = TRUE; foreach (array( - 'cur', 'new') as $subdir) { + 'cur', + 'new', + ) as $subdir) { $dir = $this->_dir . DIRECTORY_SEPARATOR . $subdir; foreach (scandir($dir) as $file) { if ($file == '.' or $file == '..') { @@ -86,8 +99,8 @@ class CRM_Mailing_MailStore_Maildir extends CRM_Mailing_MailStore { } - $set = new ezcMailFileSet(array($path)); - $single = $parser->parseMail($set); + $set = new ezcMailFileSet(array($path)); + $single = $parser->parseMail($set); $mails[$path] = $single[0]; } } @@ -131,4 +144,5 @@ class CRM_Mailing_MailStore_Maildir extends CRM_Mailing_MailStore { throw new Exception("Could not rename $file to $target"); } } + }