extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-12 17:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

GNU Patch #483.

Browse Source
This commit is contained in:
skeeter 2002-09-01 15:03:19 +00:00
parent 73bf8e96fa
commit 9d50404d22
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
phpgwapi/inc/class.send.inc.php
View File

@ -39,7 +39,7 @@
$this->err['desc'] = ' '; $this->err['desc'] = ' ';
} }
function msg($service, $to, $subject, $body, $msgtype='', $cc='', $bcc='', $from='', $sender='') function msg($service, $to, $subject, $body, $msgtype='', $cc='', $bcc='', $from='', $sender='', $content_type='')
{ {
if ($from == '') if ($from == '')
{ {
@ -84,6 +84,11 @@
} }
*/ */
if (empty($content_type))
{
$content_type ='plain';
}
if (ereg('Message-Boundary', $body)) if (ereg('Message-Boundary', $body))
{ {
$header .= 'Subject: ' . stripslashes($subject) . "\n" $header .= 'Subject: ' . stripslashes($subject) . "\n"
@ -91,10 +96,10 @@
. 'Content-Type: multipart/mixed;'."\n" . 'Content-Type: multipart/mixed;'."\n"
. ' boundary="Message-Boundary"'."\n\n" . ' boundary="Message-Boundary"'."\n\n"
. '--Message-Boundary'."\n" . '--Message-Boundary'."\n"
. 'Content-type: text/plain; charset=US-ASCII'."\n"; . 'Content-type: text/' .$content_type . '; charset=US-ASCII'."\n";
// if (!empty($msgtype)) // if (!empty($msgtype))
// { // {
// $header .= "Content-type: text/plain; phpgw-type=".$msgtype."\n"; // $header .= "Content-type: text/' .$content_type . '; phpgw-type=".$msgtype."\n";
// } // }
$header .= 'Content-Disposition: inline'."\n" $header .= 'Content-Disposition: inline'."\n"
@ -106,10 +111,10 @@
{ {
$header .= 'Subject: '.stripslashes($subject)."\n" $header .= 'Subject: '.stripslashes($subject)."\n"
. 'MIME-version: 1.0'."\n" . 'MIME-version: 1.0'."\n"
. 'Content-type: text/plain; charset="'.lang('charset').'"'."\n"; . 'Content-type: text/' .$content_type . '; charset="'.lang('charset').'"'."\n";
if (!empty($msgtype)) if (!empty($msgtype))
{ {
$header .= 'Content-type: text/plain; phpgw-type='.$msgtype."\n"; $header .= 'Content-type: text/' .$content_type . '; phpgw-type='.$msgtype."\n";
} }
$header .= 'Content-Disposition: inline'."\n" $header .= 'Content-Disposition: inline'."\n"
. 'Content-description: Mail message body'."\n"; . 'Content-description: Mail message body'."\n";