RetailCRM-Mirror/Fetch
1
0
Fork 0
mirror of https://github.com/retailcrm/Fetch.git synced 2024-11-22 19:26:01 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #98 from gwarnants/master

Browse Source 
Allow setFlags() to set multiple flags as an array + minor code reviews
This commit is contained in:
Robert Hafner 2015-02-05 23:35:41 -08:00
commit 6f713cb97d
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Fetch/Message.php
View File

@ -77,7 +77,7 @@ class Message
* *
* @var string * @var string
*/ */
protected static $flagTypes = array('recent', 'flagged', 'answered', 'deleted', 'seen', 'draft'); protected static $flagTypes = array(self::FLAG_RECENT, self::FLAG_FLAGGED, self::FLAG_ANSWERED, self::FLAG_DELETED, self::FLAG_SEEN, self::FLAG_DRAFT);
/** /**
* This holds the plantext email message. * This holds the plantext email message.
@ -361,7 +361,7 @@ class Message
} }
} else { } else {
if (!isset($this->plaintextMessage) && isset($this->htmlMessage)) { if (!isset($this->plaintextMessage) && isset($this->htmlMessage)) {
$output = preg_replace('/\<br(\s*)?\/?\>/i', PHP_EOL, trim($this->htmlMessage) ); $output = preg_replace('/\s*\<br\s*\/?\>/i', PHP_EOL, trim($this->htmlMessage) );
$output = strip_tags($output); $output = strip_tags($output);
return $output; return $output;
@ -686,33 +686,42 @@ class Message
* @param string $flag Recent, Flagged, Answered, Deleted, Seen, Draft * @param string $flag Recent, Flagged, Answered, Deleted, Seen, Draft
* @return bool * @return bool
*/ */
public function checkFlag($flag = 'flagged') public function checkFlag($flag = self::FLAG_FLAGGED)
{ {
return (isset($this->status[$flag]) && $this->status[$flag] === true); return (isset($this->status[$flag]) && $this->status[$flag] === true);
} }
/** /**
* This function is used to enable or disable a flag on the imap message. * This function is used to enable or disable one or more flags on the imap message.
* *
* @param string $flag Flagged, Answered, Deleted, Seen, Draft * @param string|array $flag Flagged, Answered, Deleted, Seen, Draft
* @param bool $enable * @param bool $enable
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
* @return bool * @return bool
*/ */
public function setFlag($flag, $enable = true) public function setFlag($flag, $enable = true)
{ {
if (!in_array($flag, self::$flagTypes) || $flag == 'recent') $flags = (is_array($flag)) ? $flag : array($flag);
throw new \InvalidArgumentException('Unable to set invalid flag "' . $flag . '"');
$imapifiedFlag = '\\' . ucfirst($flag); foreach ($flags as $i => $flag) {
$flag = ltrim(strtolower($flag), '\\');
if (!in_array($flag, self::$flagTypes) || $flag == self::FLAG_RECENT)
throw new \InvalidArgumentException('Unable to set invalid flag "' . $flag . '"');
if ($enable) {
$this->status[$flag] = true;
} else {
unset($this->status[$flag]);
}
$flags[$i] = $flag;
}
$imapifiedFlag = '\\'.implode(' \\', array_map('ucfirst', $flags));
if ($enable === true) { if ($enable === true) {
$this->status[$flag] = true;
return imap_setflag_full($this->imapStream, $this->uid, $imapifiedFlag, ST_UID); return imap_setflag_full($this->imapStream, $this->uid, $imapifiedFlag, ST_UID);
} else { } else {
unset($this->status[$flag]);
return imap_clearflag_full($this->imapStream, $this->uid, $imapifiedFlag, ST_UID); return imap_clearflag_full($this->imapStream, $this->uid, $imapifiedFlag, ST_UID);
} }
} }