Update of /cvsroot/mhonarc/mhonarc/MHonArc/lib
In directory subversions:/tmp/cvs-serv7422/lib
Modified Files:
mhamain.pl
Log Message:
* Warning message, "Unable to process data..." removed from message
page when unable to convert any part of a message (usually due to
user-defined MIMEFILTERS settings). Instead, a warning message
is generated to standard error (like other mhonarc warnings) and
the resulting message page will have a blank message body.
Index: mhamain.pl
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/lib/mhamain.pl,v
retrieving revision 2.56
retrieving revision 2.57
diff -C2 -r2.56 -r2.57
*** mhamain.pl 4 Jan 2003 04:44:21 -0000 2.56
--- mhamain.pl 16 Jan 2003 16:57:21 -0000 2.57
***************
*** 297,307 ****
if ($index) {
$AddIndex{$index} = 1;
!
! ## Read rest of message
! $Message{$index} = &read_mail_body(
! $handle,
! $index,
! $fields,
! $NoMsgPgs);
}
--- 297,301 ----
if ($index) {
$AddIndex{$index} = 1;
! read_mail_body($handle, $index, $fields, $NoMsgPgs);
}
***************
*** 343,351 ****
if ($index) {
if ($ADD && !$SLOW) { $AddIndex{$index} = 1; }
! $Message{$index} = &read_mail_body(
! $fh,
! $index,
! $fields,
! $NoMsgPgs);
# Check if conserving memory
if ($SLOW && $DoArchive) {
--- 337,342 ----
if ($index) {
if ($ADD && !$SLOW) { $AddIndex{$index} = 1; }
! read_mail_body($fh, $index, $fields, $NoMsgPgs);
!
# Check if conserving memory
if ($SLOW && $DoArchive) {
***************
*** 385,393 ****
if ($index) {
if ($ADD && !$SLOW) { $AddIndex{$index} = 1; }
! $Message{$index} = read_mail_body(
! $fh,
! $index,
! $fields,
! $NoMsgPgs);
if ($SLOW && $DoArchive) {
output_mail($index, 1, 1);
--- 376,381 ----
if ($index) {
if ($ADD && !$SLOW) { $AddIndex{$index} = 1; }
! read_mail_body($fh, $index, $fields, $NoMsgPgs);
!
if ($SLOW && $DoArchive) {
output_mail($index, 1, 1);
***************
*** 1007,1023 ****
if (defined($CBMessageBodyRead) && defined(&$CBMessageBodyRead)) {
&$CBMessageBodyRead($fields, \$ret, \(_at_)files);
}
! if (!defined($ret) || $ret eq "") {
! $ret = join('',
! "<dl>\n",
! "<dt><strong>Warning</strong></dt>\n",
! "<dd>Unable to process data: \n",
! "<tt>",
! htmlize($fields->{'content-type'}[0] || 'text/plain'),
! "</tt>\n",
! "</dd>\n",
! "</dl>\n"
! );
}
if (@files) {
--- 995,1012 ----
if (defined($CBMessageBodyRead) && defined(&$CBMessageBodyRead)) {
&$CBMessageBodyRead($fields, \$ret, \(_at_)files);
+ $Message{$index} = $ret;
+ } else {
+ $Message{$index} = $ret;
}
! if (!defined($ret) || $ret eq '') {
! warn qq/\n/,
! qq/Warning: Empty body data generated:\n/,
! qq/ Message-Id: $MHAmsgid\n/,
! qq/ Message Number: $MHAmsgnum\n/,
! qq/ Content-Type/,
! ($fields->{'content-type'}[0] || 'text/plain'),
! qq/\n/;
! $ret = '';
}
if (@files) {
---------------------------------------------------------------------
To sign-off this list, send email to majordomo(_at_)mhonarc(_dot_)org with the
message text UNSUBSCRIBE MHONARC-DEV