summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rw-r--r--program/lib/tnef_decoder.inc10
2 files changed, 6 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 561f22fa7..0e9ccfd51 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- Fix TNEF implementation bug (#1485773)
- Fix incorrect row id parsing for LDAP contacts list (#1485784)
- Fix 'mode' parameter in sqlite DSN (#1485772)
diff --git a/program/lib/tnef_decoder.inc b/program/lib/tnef_decoder.inc
index f9b7c3684..8e3682a9b 100644
--- a/program/lib/tnef_decoder.inc
+++ b/program/lib/tnef_decoder.inc
@@ -102,7 +102,7 @@ function tnef_geti32(&$buf)
function tnef_decode_attribute($attribute, &$buf)
{
- global $debug, $download;
+ global $debug;
$length = tnef_geti32($buf);
$value = tnef_getx($length, $buf); //data
@@ -116,9 +116,9 @@ function tnef_decode_attribute($attribute, &$buf)
switch($attribute)
{
case TNEF_BODYTEXT:
- if (!$download)
+ if ($debug)
{
- printf("<b>Embedded message:</b><pre>%s</pre>",$value);
+ printf("<b>Embedded message:</b><pre>%s</pre>", $value);
}
break;
@@ -195,7 +195,7 @@ function extract_mapi_attrs($buf, &$attachment_data)
case TNEF_MAPI_ATTACH_DATA:
tnef_getx(16, $value); // skip the next 16 bytes (unknown data)
- array_shift($attachment_data); // eliminate the current (bogus) attachment
+ array_shift($attachment_data); // eliminate the current (bogus) attachment
do_tnef_decode($value, $attachment_data); // recursively process the attached message
break;
@@ -349,4 +349,4 @@ function tnef_decode($buf)
}
-?> \ No newline at end of file
+?>