extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-06 14:09:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

handle applemail multipart with no alternative as MIXED; do not fail on getStructure if there is no OK, but empty and a structure response is present

Browse Source
This commit is contained in:
Klaus Leithoff
2013-02-26 12:52:01 +00:00
parent 161269430e
commit c8066b4817
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -650,7 +650,7 @@ class Net_IMAP extends Net_IMAPProtocol {
return $ret;
}
if(strtoupper($ret["RESPONSE"]["CODE"]) != "OK"){
return new PEAR_Error($ret["RESPONSE"]["CODE"] . ", " . $ret["RESPONSE"]["STR_CODE"]);
if ($ret["RESPONSE"]["CODE"]) return new PEAR_Error($ret["RESPONSE"]["CODE"] . ", " . $ret["RESPONSE"]["STR_CODE"]);
}
// sometimes we get an [COMMAND] => OK with $ret["PARSED"][0] and no $ret["PARSED"][0]["EXT"]["BODYSTRUCTURE"]
if (is_array($ret) && isset($ret["PARSED"])) {
@ -664,6 +664,8 @@ class Net_IMAP extends Net_IMAPProtocol {
$structure = array();
$mimeParts = array();
if(strtoupper($ret["RESPONSE"]["CODE"]) != "OK" && empty($ret2)) return new PEAR_Error($ret["RESPONSE"]["CODE"] . ", " . $ret["RESPONSE"]["STR_CODE"].'/'.'No BODYSTRUCTURE found!');
if (is_array($ret2)) $this->_parseStructureArray($ret2, $mimeParts);
return array_shift($mimeParts);
@ -2583,7 +2585,7 @@ class Net_IMAP extends Net_IMAPProtocol {
*/
function getACL($mailbox_name = null )
{
if($mailbox_name == null){
if($mailbox_name == null){
$mailbox_name = $this->getCurrentMailbox();
}
if ( PEAR::isError( $ret = $this->cmdGetACL($mailbox_name) ) ) {

1
felamimail/inc/class.felamimail_bo.inc.php
View File

@ -3436,6 +3436,7 @@ class felamimail_bo
break;
case 'NIL': // multipart with no Alternative
case 'MIXED':
case 'REPORT':
case 'SIGNED':