extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-22 22:08:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

introduce preserve seen, specially use PEEK for retrieving RawHeaders, as touching the messages headers should not trigger to set the message as seen

Browse Source
This commit is contained in:
Klaus Leithoff 2012-04-26 13:15:05 +00:00
parent b643e94dd7
commit 99ec5145ce
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
egw-pear/Net/IMAP.php
View File

@ -265,9 +265,11 @@ class Net_IMAP extends Net_IMAPProtocol {
function getRawHeaders($msg_id, $part_id = '', $uidFetch = false)
{
if($part_id != '') {
$command = "BODY[$part_id.HEADER]";
$command = "BODY.PEEK[$part_id.HEADER]";
$resp_command = 'BODY[' . $part_id . '.HEADER]';
} else {
$command = "BODY[HEADER]";
$command = "BODY.PEEK[HEADER]";
$resp_command = 'BODY[HEADER]';
}
if($uidFetch == true) {
$ret=$this->cmdUidFetch($msg_id, $command);
@ -280,7 +282,7 @@ class Net_IMAP extends Net_IMAPProtocol {
if(strtoupper( $ret["RESPONSE"]["CODE"]) != "OK" ){
return new PEAR_Error($ret["RESPONSE"]["CODE"] . ", " . $ret["RESPONSE"]["STR_CODE"]);
}
$ret=$ret["PARSED"][0]["EXT"][$command]["CONTENT"];
$ret=$ret["PARSED"][0]["EXT"][$resp_command]["CONTENT"];
return $ret;
}
@ -472,17 +474,19 @@ class Net_IMAP extends Net_IMAPProtocol {
*
* @param $msg_id Message number
* @param boolean $uidFetch msg_id contains UID's instead of Message Sequence Number if set to true
* @param boolean $preserveSeen leaves the Seen Flag untouched if set to true (default is false)
*
* @return mixed Either message body or false on error
*
* @access public
*/
function getBody($msg_id, $uidFetch = false)
function getBody($msg_id, $uidFetch = false, $preserveSeen = false)
{
$peek = ($preserveSeen) ? ".PEEK" : "";
if($uidFetch) {
$ret=$this->cmdUidFetch($msg_id,"BODY[TEXT]");
$ret=$this->cmdUidFetch($msg_id,"BODY".$peek."[TEXT]");
} else {
$ret=$this->cmdFetch($msg_id,"BODY[TEXT]");
$ret=$this->cmdFetch($msg_id,"BODY".$peek."[TEXT]");
}
if (PEAR::isError($ret)) {
return $ret;
@ -502,17 +506,19 @@ class Net_IMAP extends Net_IMAPProtocol {
* @param $msg_id Message number
* @param string $partId Message number
* @param boolean $uidFetch msg_id contains UID's instead of Message Sequence Number if set to true
* @param boolean $preserveSeen leaves the Seen Flag untouched if set to true (default is false)
*
* @return mixed Either message body or false on error
*
* @access public
*/
function getBodyPart($msg_id, $partId, $uidFetch = false)
function getBodyPart($msg_id, $partId, $uidFetch = false, $preserveSeen = false)
{
$peek = ($preserveSeen) ? ".PEEK" : "" ;
if($uidFetch) {
$ret=$this->cmdUidFetch($msg_id,"BODY[$partId]");
$ret=$this->cmdUidFetch($msg_id,"BODY".$peek."[$partId]");
} else {
$ret=$this->cmdFetch($msg_id,"BODY[$partId]");
$ret=$this->cmdFetch($msg_id,"BODY".$peek."[$partId]");
}
if (PEAR::isError($ret)) {
return $ret;