[Phpgroupware-cvs] CVS: phpgwapi/inc class.send.inc.php,1.13.2.1,1.13.2.2

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv13137/phpgwapi/inc

Modified Files:
      Tag: Version-0_9_14-branch
        class.send.inc.php 
Log Message:
GNU Patch #483.

Index: class.send.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.send.inc.php,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -r1.13.2.1 -r1.13.2.2
*** class.send.inc.php  12 Apr 2002 14:20:49 -0000      1.13.2.1
--- class.send.inc.php  1 Sep 2002 15:03:31 -0000       1.13.2.2
***************
*** 40,44 ****
                }
  
!               function msg($service, $to, $subject, $body, $msgtype='', 
$cc='', $bcc='', $from='', $sender='')
                {
                        if ($from == '')
--- 40,44 ----
                }
  
!               function msg($service, $to, $subject, $body, $msgtype='', 
$cc='', $bcc='', $from='', $sender='', $content_type='')
                {
                        if ($from == '')
***************
*** 85,88 ****
--- 85,93 ----
                                */
  
+                               if (empty($content_type))
+                               {
+                                       $content_type ='plain';
+                               }
+ 
                                if (ereg('Message-Boundary', $body)) 
                                {
***************
*** 92,99 ****
                                                . ' 
boundary="Message-Boundary"'."\n\n"
                                                . '--Message-Boundary'."\n"
!                                               . 'Content-type: text/plain; 
charset=US-ASCII'."\n";
  //                                    if (!empty($msgtype))
  //                                    {
! //                                            $header .= "Content-type: 
text/plain; phpgw-type=".$msgtype."\n";
  //                                    }
  
--- 97,104 ----
                                                . ' 
boundary="Message-Boundary"'."\n\n"
                                                . '--Message-Boundary'."\n"
!                                               . 'Content-type: text/' 
.$content_type . '; charset=US-ASCII'."\n";
  //                                    if (!empty($msgtype))
  //                                    {
! //                                            $header .= "Content-type: 
text/' .$content_type . '; phpgw-type=".$msgtype."\n";
  //                                    }
  
***************
*** 107,114 ****
                                        $header .= 'Subject: 
'.stripslashes($subject)."\n"
                                                . 'MIME-version: 1.0'."\n"
!                                               . 'Content-type: text/plain; 
charset="'.lang('charset').'"'."\n";
                                        if (!empty($msgtype))
                                        {
!                                               $header .= 'Content-type: 
text/plain; phpgw-type='.$msgtype."\n";
                                        }
                                        $header .= 'Content-Disposition: 
inline'."\n"
--- 112,119 ----
                                        $header .= 'Subject: 
'.stripslashes($subject)."\n"
                                                . 'MIME-version: 1.0'."\n"
!                                               . 'Content-type: text/' 
.$content_type . '; charset="'.lang('charset').'"'."\n";
                                        if (!empty($msgtype))
                                        {
!                                               $header .= 'Content-type: 
text/' .$content_type . '; phpgw-type='.$msgtype."\n";
                                        }
                                        $header .= 'Content-Disposition: 
inline'."\n"
***************
*** 393,395 ****
                        return True;
                }
!       } /* end of class */
--- 398,400 ----
                        return True;
                }
!       } /* end of class */
\ No newline at end of file