Author: ralfbecker
New Revision: 55239
URL: http://svn.stylite.de/viewvc/egroupware?rev=55239&view=rev
Log:
TNEF decoder requires a string no stream
Modified:
branches/14.2/emailadmin/ (props changed)
branches/14.2/emailadmin/inc/class.emailadmin_imapbase.inc.php
Propchange: branches/14.2/emailadmin/
— svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 3 16:36:21 2016
@@ -1,1 +1,1 @@
-/trunk/emailadmin:51376,51404,51509,51768,51812,51817,52026,52129,52166,52209,52225,52227,52268,52280,52360,52393,52404,52522,52535,52557,52577,52586,52590,52594,52604,52606,52612,52615,52702,52704,52758,52760,52763,52778,52839,52853,52917-52918,52975,53032,53049,53052,53087,53116,53118,53146-53147,53158,53190,53231,53260,53262,53264,53276,53281,53297,53303-53304,53403,53424,53436,53484,53686,53695,53739,53763,53799,53801,53804-53805,53807,53809,53842,54017,54019,54021,54024,54028,54052,54060,54138,54190,54298,54331,54334,54392,54432,54522,54530,54532,54543,54547,54950
+/trunk/emailadmin:51376,51404,51509,51768,51812,51817,52026,52129,52166,52209,52225,52227,52268,52280,52360,52393,52404,52522,52535,52557,52577,52586,52590,52594,52604,52606,52612,52615,52702,52704,52758,52760,52763,52778,52839,52853,52917-52918,52975,53032,53049,53052,53087,53116,53118,53146-53147,53158,53190,53231,53260,53262,53264,53276,53281,53297,53303-53304,53403,53424,53436,53484,53686,53695,53739,53763,53799,53801,53804-53805,53807,53809,53842,54017,54019,54021,54024,54028,54052,54060,54138,54190,54298,54331,54334,54392,54432,54522,54530,54532,54543,54547,54950,55238
— branches/14.2/emailadmin/inc/class.emailadmin_imapbase.inc.php (original)
+++ branches/14.2/emailadmin/inc/class.emailadmin_imapbase.inc.php Thu Mar 3 16:36:21 2016
@@ -5533,15 +5533,17 @@
if ($ext && stripos($filename,’.’)===false && stripos($filename,$ext)===false) $filename = trim($filename).’.’.$ext;
if (!$part)
{
-
error_log(__METHOD__.__LINE__.'Error: Could not fetch attachment for:'." Uid:$_uid, PartId:$_partID, WinMailNr:$_winmail_nr in $_folder:".array2string(function_backtrace()));
-
error_log(__METHOD__.__LINE__.'# Fetched StructureMime:'.$structure_mime.' with Filename:'.$filename);
-
throw new egw_exception_wrong_parameter("Error: Could not fetch attachment for Uid=$_uid, PartId=$_partID, WinMailNr=$_winmail_nr, folder=$_folder");
}
$attachmentData = array(
'type' => $structure_mime,
'filename' => $filename,
//'attachment' => $part->getContents(array('stream'=>$_stream))
-
'attachment' => ($part?$part->getContents(array('stream'=>$_stream)):'Error: Could not fetch attachment for:'." Uid:$_uid, PartId:$_partID, WinMailNr:$_winmail_nr in $_folder:".array2string(function_backtrace()))
-
);
-
'attachment' => $part->getContents(array(
-
// tnef_decode needs strings not a stream
-
'stream' => $_stream && !($filename == 'winmail.dat' && $_winmail_nr)
-
)),
-
);
// try guessing the mimetype, if we get the application/octet-stream
if (strtolower($attachmentData['type']) == 'application/octet-stream') $attachmentData['type'] = mime_magic::filename2mime($attachmentData['filename']);
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
