holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

logging while TNEF decoding fails

Browse Source
This commit is contained in:
Ralf Becker 2014-10-01 11:11:42 +00:00
parent cd30e8bee1
commit 0a34fceee2
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
emailadmin/inc/class.emailadmin_imapbase.inc.php
View File

@ -4922,8 +4922,14 @@ class emailadmin_imapbase
*/ */
public function tnef_decoder( $data ) public function tnef_decoder( $data )
{ {
if (class_exists('Horde_Compress',true)==false) return false; foreach(array('Horde_Compress', 'Horde_Icalendar', 'Horde_Mapi') as $class)
{
if (!class_exists($class))
{
error_log(__METHOD__."() missing required PEAR package $class --> aborting");
return false;
}
}
$parts_obj = new Horde_Mime_part; $parts_obj = new Horde_Mime_part;
$parts_obj->setType('multipart/mixed'); $parts_obj->setType('multipart/mixed');
@ -4931,7 +4937,10 @@ class emailadmin_imapbase
try try
{ {
$tnef_data = $tnef_object->decompress($data); $tnef_data = $tnef_object->decompress($data);
} catch (Horde_Exception $ex) { }
catch (Horde_Exception $ex)
{
error_log(__METHOD__."() ".$ex->getMessage().' --> aborting');
return false; return false;
} }
if (is_array($tnef_data)) if (is_array($tnef_data))
@ -5053,7 +5062,7 @@ class emailadmin_imapbase
if (empty($attachment['filename'])) $attachment['filename'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.mime_magic::mime2ext($attachment['mimeType']); if (empty($attachment['filename'])) $attachment['filename'] = (isset($attachment['cid'])&&!empty($attachment['cid'])?$attachment['cid']:lang("unknown").'_Uid'.$_uid.'_Part'.$mime_id).'.'.mime_magic::mime2ext($attachment['mimeType']);
$wmattach = $attachment; $wmattach = $attachment;
$wmattach['attachment'] = $part->getContents(array('stream'=>$_stream)); $wmattach['attachment'] = $part->getContents(array('stream'=>$_stream));
} }
} }
} }

6
emailadmin/setup/setup.inc.php
View File

@ -85,7 +85,7 @@ $setup_info['emailadmin']['check_install'] = array(
'from' => 'EMailAdmin', 'from' => 'EMailAdmin',
'version' => '1.3.0', 'version' => '1.3.0',
), ),
// next 3 are required for TNEF support // next 4 are required for TNEF support
'pear.horde.org/Horde_Compress' => array( 'pear.horde.org/Horde_Compress' => array(
'func' => 'pear_check', 'func' => 'pear_check',
'from' => 'EMailAdmin', 'from' => 'EMailAdmin',
@ -101,5 +101,9 @@ $setup_info['emailadmin']['check_install'] = array(
'from' => 'EMailAdmin', 'from' => 'EMailAdmin',
'version' => '1.0.0', 'version' => '1.0.0',
), ),
'bcmath' => array(
'func' => 'extension_check',
'from' => 'EMailAdmin',
),
); );