removed encodeHeader calls for the complete addresses, Only the personal
[squirrelmail.git] / class / deliver / Deliver.class.php
index 8872686c6a901d6f7af1475d9025237b1d28490a..8b9ae88ee4e646bf7c19845c836b99945d951227 100644 (file)
 <?php
 
+/**
+ * Deliver.class.php
+ *
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * This contains all the functions needed to send messages through
+ * a delivery backend.
+ *
+ * $Id$
+ */
+
 class Deliver {
 
-    function prepareMIME_Header($message, $rn) {
-       $mime_header = $message->header;
+    function mail($message, $stream=false) {
+       $rfc822_header = $message->rfc822_header;
+       if (count($message->entities)) {
+          $boundary = $this->mimeBoundary();
+         $rfc822_header->content_type->properties['boundary']='"'.$boundary.'"';
+       } else {
+          $boundary='';
+       }
+       $raw_length = 0;
+       $reply_rfc822_header = (isset($message->reply_rfc822_header) 
+                            ? $message->reply_rfc822_header : '');
+       $header = $this->prepareRFC822_Header($rfc822_header, $reply_rfc822_header, $raw_length);
+
+       if ($stream) {
+            $this->preWriteToStream($header);
+            $this->writeToStream($stream, $header);
+       }
+       $this->writeBody($message, $stream, $raw_length, $boundary);
+       return $raw_length;
+    }
+    
+    function writeBody($message, $stream, &$length_raw, $boundary='') {
+        if ($boundary && !$message->rfc822_header) {
+           $s = '--'.$boundary."\r\n";
+           $s .= $this->prepareMIME_Header($message, $boundary);
+           $length_raw += strlen($s);
+           if ($stream) {
+                $this->preWriteToStream($s);
+               $this->writeToStream($stream, $s);
+           }
+        }
+       $this->writeBodyPart($message, $stream, $length_raw);
+       $boundary_depth = substr_count($message->entity_id,'.');
+       if ($boundary_depth) {
+          $boundary .= '_part'.$boundary_depth;
+       }
+       $last = false;
+       for ($i=0, $entCount=count($message->entities);$i<$entCount;$i++) {
+           $msg = $this->writeBody($message->entities[$i], $stream, $length_raw, $boundary);
+           if ($i == $entCount-1) $last = true;
+       }
+        if ($boundary && $last) {
+           $s = "--".$boundary."--\r\n\r\n";
+           $length_raw += strlen($s);
+           if ($stream) {
+                $this->preWriteToStream($s);
+               $this->writeToStream($stream, $s);
+           }
+       }
+    }
+
+    function writeBodyPart($message, $stream, &$length) {
+        if ($message->mime_header) {
+          $type0 = $message->mime_header->type0;
+       } else {
+          $type0 = $message->rfc822_header->content_type->type0;
+       }
+       
+       $body_part_trailing = $last = '';
+       switch ($type0) {
+       case 'text':
+       case 'message':
+           if ($message->body_part) {
+              $body_part = $message->body_part;
+              $length += $this->clean_crlf($body_part);
+              if ($stream) {
+                  $this->preWriteToStream($body_part);     
+                 $this->writeToStream($stream, $body_part);
+              }
+              $last = $body_part;
+           } elseif ($message->att_local_name) {
+               $filename = $message->att_local_name;
+               $file = fopen ($filename, 'rb');
+               while ($body_part = fgets($file, 4096)) {
+                  $length += $this->clean_crlf($body_part);
+                  if ($stream) {
+                     $this->preWriteToStream($body_part);
+                     $this->writeToStream($stream, $body_part);
+                   }
+                  $last = $body_part;
+               }
+               fclose($file);
+            }
+           break;
+       default:
+           if ($message->body_part) {
+              $body_part = $message->body_part;
+              $length += $this->clean_crlf($body_part);
+              if ($stream) {
+                 $this->writeToStream($stream, $body_part);
+              }
+           } elseif ($message->att_local_name) {
+               $filename = $message->att_local_name;
+               $file = fopen ($filename, 'rb');
+               $encoded = '';
+               while ($tmp = fread($file, 570)) {
+                  $body_part = chunk_split(base64_encode($tmp));
+                  $length += $this->clean_crlf($body_part);
+                  if ($stream) {
+                     $this->writeToStream($stream, $body_part);
+                  }
+               }
+               fclose($file);
+           }
+           break;
+       }
+       $body_part_trailing = '';
+       if ($last && substr($last,-1) != "\n") {
+          $body_part_trailing = "\r\n";
+       }
+       if ($body_part_trailing) {
+           $length += strlen($body_part_trailing);
+           if ($stream) {
+               $this->preWriteToStream($body_part_trailing);     
+               $this->writeToStream($stream, $body_part_trailing);
+           }
+       }
+    }
+    
+    function clean_crlf(&$s) {
+        $s = str_replace("\r\n", "\n", $s);
+        $s = str_replace("\r", "\n", $s);
+        $s = str_replace("\n", "\r\n", $s);
+       return strlen($s);
+    }
+    
+    function strip_crlf(&$s) {
+        $s = str_replace("\r\n ", '', $s);
+       $s = str_replace("\r", '', $s);
+       $s = str_replace("\n", '', $s);
+    }
+
+    function preWriteToStream(&$s) {
+    }
+    
+    function writeToStream($stream, $data) {
+       fputs($stream, $data);
+    }
+    
+    function initStream($message, $length=0, $host='', $port='', $user='', $pass='') {
+       return $stream;
+    }
+    
+    function getBcc() {
+       return false;
+    }
+
+    function prepareMIME_Header($message, $boundary) {
+       $mime_header = $message->mime_header;
+       $rn="\r\n";
        $header = array();
-        
-       $contenttype = 'Content-Type: '. $mime_header->contenttype->type0 .'/'.
-                      $mime_header->contenttype->type1;
+       
+       $contenttype = 'Content-Type: '. $mime_header->type0 .'/'.
+                      $mime_header->type1;
+       if (count($message->entities)) {
+           $contenttype .= ";\r\n " . 'boundary="'.$boundary.'"';
+       }                      
        if (isset($mime_header->parameters['name'])) {
-           $contenttype .= ";\r\n " . 'name="'.
+           $contenttype .= '; name="'.
                encodeHeader($mime_header->parameters['name']). '"';
        }
+       if (isset($mime_header->parameters['charset'])) {
+           $charset = $mime_header->parameters['charset'];
+           $contenttype .= '; charset="'.
+               encodeHeader($charset). '"';
+       }
+
+
        $header[] = $contenttype . $rn;
        if ($mime_header->description) {
            $header[] .= 'Content-Description: ' . $mime_header->description . $rn;
        }
        if ($mime_header->encoding) {
+           $encoding = $mime_header->encoding;
            $header[] .= 'Content-Transfer-Encoding: ' . $mime_header->encoding . $rn;
+       } else {
+           if ($mime_header->type0 == 'text' || $mime_header->type0 == 'message') {
+               $header[] .= 'Content-Transfer-Encoding: 8bit' .  $rn;
+           } else {
+               $header[] .= 'Content-Transfer-Encoding: base64' .  $rn;
+           }
        }
        if ($mime_header->id) {
            $header[] .= 'Content-ID: ' . $mime_header->id . $rn;
        }
        if ($mime_header->disposition) {
-           $contentdisp .= 'Content-Disposition: ' . $mime_header->disposition;
-           if (isset($mime_header->parameters['filename'])) {
-               $contentdisp .= ";\r\n " . 'filename="'.
-                   encodeHeader($mime_header->parameters['filename']). '"';
+           $disposition = $mime_header->disposition;
+           $contentdisp = 'Content-Disposition: ' . $disposition->name;
+           if ($disposition->getProperty('filename')) {
+               $contentdisp .= '; filename="'.
+                   encodeHeader($disposition->getProperty('filename')). '"';
            }
            $header[] = $contentdisp . $rn;       
        }
@@ -40,196 +218,270 @@ class Deliver {
        $cnt = count($header);
        $hdr_s = '';
        for ($i = 0 ; $i < $cnt ; $i++) {
-           $hdr_s .= foldLine($header[$i], 78, '    ');
+           $hdr_s .= $this->foldLine($header[$i], 78,str_pad('',4));
        }
        $header = $hdr_s;
-       $header .= $rn; /* One blank line to separate header and body */
+       $header .= $rn; /* One blank line to separate mimeheader and body-entity */
+       return $header;
     }    
 
-    function prepareRFC822_Header($rfc822_header) {
-       global $REMOTE_ADDR, $SERVER_NAME, $REMOTE_PORT;
-       global $version, $useSendmail, $username;
-       global $HTTP_VIA, $HTTP_X_FORWARDED_FOR;
-       global $REMOTE_HOST;
-        
+    function prepareRFC822_Header($rfc822_header, $reply_rfc822_header, &$raw_length) {
+        $REMOTE_ADDR = $_SERVER['REMOTE_ADDR'];
+        $SERVER_NAME = $_SERVER['SERVER_NAME'];
+        $REMOTE_PORT = $_SERVER['REMOTE_PORT'];
+        if(isset($_SERVER['REMOTE_HOST'])) {
+            $REMOTE_HOST = $_SERVER['REMOTE_HOST'];
+        }
+        if(isset($_SERVER['HTTP_VIA'])) {
+            $HTTP_VIA = $_SERVER['HTTP_VIA'];
+        }
+        if(isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+            $HTTP_X_FORWARDED_FOR = $_SERVER['HTTP_X_FORWARDED_FOR'];
+        }
+       global $version, $username;
+       $rn = "\r\n";
        /* This creates an RFC 822 date */
-       $date = date("D, j M Y H:i:s ", mktime()) . timezone();
+       $date = date('D, j M Y H:i:s ', mktime()) . $this->timezone();
        /* Create a message-id */
        $message_id = '<' . $REMOTE_PORT . '.' . $REMOTE_ADDR . '.';
        $message_id .= time() . '.squirrel@' . $SERVER_NAME .'>';
        /* Make an RFC822 Received: line */
-    if (isset($REMOTE_HOST))
-    {
-        $received_from = "$REMOTE_HOST ([$REMOTE_ADDR])";
-    }
-    else 
-    {
-        $received_from = $REMOTE_ADDR;
-    }
-    if (isset($HTTP_VIA) || isset ($HTTP_X_FORWARDED_FOR)) {
-        if ($HTTP_X_FORWARDED_FOR == '') {
-            $HTTP_X_FORWARDED_FOR = 'unknown';
-        }
-        $received_from .= " (proxying for $HTTP_X_FORWARDED_FOR)";
-    }
-    $header = array();
-    $header[] = "Received: from $received_from" . $rn;
-    $header[] = "        (SquirrelMail authenticated user $username)" . $rn;
-    $header[] = "        by $SERVER_NAME with HTTP;" . $rn;
-    $header[] = "        $date" . $rn;
-    /* Insert the rest of the header fields */
-    $header[] = "Message-ID: $message_id" . $rn;
-    $header[] = "Date: $date" . $rn;
-    $header[] = 'Subject: '.encodeHeader($rfc822_header->subject) . $rn;
-    $header[] = 'From: '. encodeHeader($rfc822_header->getAddr_s('from')) . $rn;
-    if (count($rfc822_header->from) > 1) /* RFC2822 if from contains 
-                                            more then 1 address */
-    {
-       $header[] = 'Sender: '. encodeHeader($rfc822_header->getAddr_s('sender')) . $rn;
-    }
-    $header[] = 'To: '. encodeHeader($rfc822_header->getAddr_s('to')) . $rn;    // Who it's TO
-    if (count($rfc_header->cc))
-    {
-       $header[] = 'Cc: '. encodeHeader($rfc822_header->getAddr_s('cc')) . $rn;
-    }
-    if (count($rfc822_header->$reply_to))
-    {
-       $header[] = 'Reply-To: '. encodeHeader($rfc822_header->getAddr_s('reply_to')) . $rn;
-    }
-    if (count($rfc_header->bcc) && $useSendmail)
-    {
-       $header[] = 'Bcc: '. encodeHeader($rfc822_header->getAddr_s('bcc')) . $rn;
-    }
-    /* Identify SquirrelMail */        
-    $header[] = "X-Mailer: SquirrelMail (version $version)" . $rn; 
-    /* Do the MIME-stuff */
-    $header[] = "MIME-Version: 1.0" . $rn;
-    $contenttype = 'Content-Type: '. $rfc822_header->contenttype->type0 .'/'.
-                   $rfc822_header->contenttype->type1;
-    if (count($rfc822_header->contenttype->properties))
-    {
-        foreach ($rfc822_header->contenttype->properties as $k => $v)
-        {
-            $contenttype .= ';'. "\r\n " .$k.'='.$v; /* FOLDING */
+       if (isset($REMOTE_HOST)) {
+           $received_from = "$REMOTE_HOST ([$REMOTE_ADDR])";
+       } else {
+           $received_from = $REMOTE_ADDR;
+       }
+       if (isset($HTTP_VIA) || isset ($HTTP_X_FORWARDED_FOR)) {
+           if (!isset($HTTP_X_FORWARDED_FOR) || $HTTP_X_FORWARDED_FOR == '') {
+               $HTTP_X_FORWARDED_FOR = 'unknown';
+           }
+           $received_from .= " (proxying for $HTTP_X_FORWARDED_FOR)";
+       }
+       $header = array();
+       $header[] = "Received: from $received_from" . $rn;
+        $header[] = "        (SquirrelMail authenticated user $username)" . $rn;
+        $header[] = "        by $SERVER_NAME with HTTP;" . $rn;
+       $header[] = "        $date" . $rn;
+        /* Insert the rest of the header fields */
+        $header[] = 'Message-ID: '. $message_id . $rn;
+        if ($reply_rfc822_header->message_id) {
+           $rep_message_id = $reply_rfc822_header->message_id;
+//         $this->strip_crlf($message_id);
+           $header[] = 'In-Reply-To: '.$rep_message_id . $rn;
+           $references = $this->calculate_references($reply_rfc822_header);
+           $header[] = 'References: '.$references . $rn;
+       }       
+       $header[] = "Date: $date" . $rn;
+        $header[] = 'Subject: '.encodeHeader($rfc822_header->subject) . $rn;
+        $header[] = 'From: '. $rfc822_header->getAddr_s('from',',',true) . $rn;
+       /* RFC2822 if from contains more then 1 address */      
+        if (count($rfc822_header->from) > 1) {
+           $header[] = 'Sender: '. $rfc822_header->getAddr_s('sender',',',true) . $rn;
+       }
+       if (count($rfc822_header->to)) {
+           $header[] = 'To: '. $rfc822_header->getAddr_s('to',',',true) . $rn;
         }
+       if (count($rfc822_header->cc)) {
+           $header[] = 'Cc: '. $rfc822_header->getAddr_s('cc',',',true) . $rn;
+       }
+       if (count($rfc822_header->reply_to)) {
+           $header[] = 'Reply-To: '. $rfc822_header->getAddr_s('reply_to',',',true) . $rn;
+       }
+       /* Sendmail should return true. Default = false */
+       $bcc = $this->getBcc();
+       if (count($rfc822_header->bcc)) {
+           $s = 'Bcc: '. $rfc822_header->getAddr_s('bcc',',',true) . $rn;
+           if (!$bcc) {
+              $s = $this->foldLine($s, 78, str_pad('',4));
+              $raw_length += strlen($s);
+           } else {
+              $header[] = $s;
+           }
+       }
+       /* Identify SquirrelMail */     
+       $header[] = 'User-Agent: SquirrelMail/' . $version . $rn; 
+       /* Do the MIME-stuff */
+       $header[] = 'MIME-Version: 1.0' . $rn;
+       $contenttype = 'Content-Type: '. $rfc822_header->content_type->type0 .'/'.
+                                         $rfc822_header->content_type->type1;
+       if (count($rfc822_header->content_type->properties)) {
+           foreach ($rfc822_header->content_type->properties as $k => $v) {
+               if ($k && $v) {
+                   $contenttype .= ';' .$k.'='.$v; 
+               }
+           }
+       }
+        $header[] = $contenttype . $rn;
+        if ($rfc822_header->dnt) {
+           $dnt = $rfc822_header->getAddr_s('dnt'); 
+           /* Pegasus Mail */
+           $header[] = 'X-Confirm-Reading-To: '.$dnt. $rn;
+           /* RFC 2298 */
+           $header[] = 'Disposition-Notification-To: '.$dnt. $rn;
+       }
+       if ($rfc822_header->priority) {
+           $prio = $rfc822_header->priority;
+           $header[] = 'X-Priority: '.$prio. $rn;
+           switch($prio) {
+             case 1: $header[] = 'Importance: High'. $rn; break;
+             case 3: $header[] = 'Importance: Normal'. $rn; break;
+             case 5: $header[] = 'Importance: Low'. $rn; break;
+             default: break;
+           }
+       }
+       /* Insert headers from the $more_headers array */       
+       if(count($rfc822_header->more_headers)) {
+           reset($rfc822_header->more_headers);
+           foreach ($rfc822_header->more_headers as $k => $v) {
+               $header[] = $k.': '.$v .$rn;
+           }          
+       }        
+       $cnt = count($header);
+       $hdr_s = '';
+       for ($i = 0 ; $i < $cnt ; $i++) {
+           $hdr_s .= $this->foldLine($header[$i], 78, str_pad('',4));
+       }
+//     $debug = "Debug: <123456789012345678901234567890123456789012345678901234567890123456789>\r\n";
+//     $this->foldLine($debug, 78, str_pad('',4));
+       $header = $hdr_s;
+       $header .= $rn; /* One blank line to separate header and body */
+       $raw_length += strlen($header);
+       return $header;
     }
-    $header[] = $contenttype . $rn;
-    if ($rfc822_header->dnt)
-    {
-       $dnt = $rfc822_header->getAddr_s('dnt'); 
-        /* Pegasus Mail */
-        $header[] = 'X-Confirm-Reading-To: '.$dnt;
-        /* RFC 2298 */
-        $header[] = 'Disposition-Notification-To: '.$dnt;
-    }
-    if ($rfc822_header->priority)
-    {
-        $prio = $rfc822_header->priority;
-       $header[] = 'X-Priority: '.$prio;
-        switch($prio)
-       {
-        case 1: 
-          $header[] = 'Importance: High';
-           $header[] = 'X-MSMail-Priority: High';
-           break;
-        case 3: 
-          $header[] = 'Importance: Normal';
-           $header[] = 'X-MSMail-Priority: Normal';
-           break;
-        case 5:
-          $header[] = 'Importance: Low';
-           $header[] = 'X-MSMail-Priority: Low';
-           break;
-       default:
-          break;
+
+    /*
+    * function for cleanly folding of headerlines
+    */
+    function foldLine($line, $length, $pre='') {
+        $line = substr($line,0, -2);
+        $length -= 2; /* do not fold between \r and \n */
+        $cnt = strlen($line);
+        if ($cnt > $length) { /* try folding */
+            $fold_string = "\r\n " . $pre;
+            $bFirstFold = false;
+            $aFoldLine = array();
+            while (strlen($line) > $length) {
+                $fold = false;
+                /* handle encoded parts */
+                if (preg_match('/(=\?.+\?.+\?.+\?=)/',$line,$regs)) {
+                    $fold_tmp = $regs[1];
+                    $iPosEnc = strpos($line,$fold_tmp);
+                    $iLengthEnc = strlen($fold_tmp);
+                    if ($iPosEnc < $length && ($iPosEnc + $iLengthEnc > $length)) {
+                        $fold = true;
+                        /* fold just before the start of the encoded string */
+                        $aFoldLine[] = substr($line,0,$iPosEnc);
+                        $line = substr($line,$iPosEnc);
+                        if (!$bFirstFold) {
+                            $bFirstFold = true;
+                            $length -= strlen($fold_string);
+                        }
+                        if ($iLengthEnc > $length) { /* place the encoded
+                            string on a separate line and do not fold inside it*/
+                            if ($iLengthEnc < (998 - strlen($fold_string))) { 
+                                $aFoldLine[] = substr($line,0,$iLengthEnc);
+                                $line = substr($line,$iLengthEnc);
+                            } else { /* line is too long, continue with normal folding */
+                                $fold = false;
+                            }
+                        }
+                    } else { /* the encoded string fits into the foldlength */
+                        /*remainder */
+                        $iPosEncEnd = $iPosEnc+$iLengthEnc;
+                        $sLineRem = substr($line,$iPosEncEnd,$length - $iPosEncEnd);
+                        if (!preg_match('/[=,;\s]/',$sLineRem)) {
+                            /*impossible to fold clean in the next part -> fold after the enc string */
+                            $aFoldLine[] = substr($line,0,$iPosEncEnd+1);
+                            $line = substr($line,$iPosEncEnd+1);
+                            $fold = true;
+                            if (!$bFirstFold) {
+                                $bFirstFold = true;
+                                $length -= strlen($fold_string);
+                            }
+                        }
+                    }
+                }
+                if (!$fold) {
+                    $line_tmp = substr($line,0,$length);
+                    $iFoldPos = false;
+                    /* try to fold at logical places */
+                    switch (true)
+                    {
+                    case ($iFoldPos = strrpos($line_tmp,',')): break;
+                    case ($iFoldPos = strrpos($line_tmp,';')): break;
+                    case ($iFoldPos = strrpos($line_tmp,' ')): break;
+                    case ($iFoldPos = strrpos($line_tmp,'=')): break;
+                    default: break;
+                    }
+                    
+                    if (!$iFoldPos) { /* clean folding didn't work */
+                        $iFoldPos = $length;
+                    }
+                    $aFoldLine[] = substr($line,0,$iFoldPos+1);
+                    $line = substr($line,$iFoldPos+1);
+                    if (!$bFirstFold) {
+                        $bFirstFold = true;
+                        $length -= strlen($fold_string);
+                    }
+                }
+            }
+            /*$reconstruct the line */
+            if ($line) {
+                $aFoldLine[] = $line;
+            }
+            $line = implode($fold_string,$aFoldLine);
         }
+        return $line."\r\n";
     }
-    /* Insert headers from the $more_headers array */  
-    if(count($more_headers)) 
-    {
-        reset($more_headers);
-        foreach ($more_headers as $k => $v)
-       {
-           $header[] = $k.': '.$v;
-        }             
-    }        
-    $cnt = count($header);
-    $hdr_s = '';
-    for ($i = 0 ; $i < $cnt ; $i++)
-    {
-        $hdr_s .= foldLine($header[$i], 78, '    ');
+
+    function mimeBoundary () {
+       static $mimeBoundaryString;
+
+       if ( !isset( $mimeBoundaryString ) ||
+           $mimeBoundaryString == '') {
+           $mimeBoundaryString = '----=_' . date( 'YmdHis' ) . '_' .
+               mt_rand( 10000, 99999 );
+       }
+       return $mimeBoundaryString;
     }
-    $header = $hdr_s;
-    $header .= $rn; /* One blank line to separate header and body */
-    $headerlength = strlen($header);
-    
-    /* Write the header */
-    if ($fp) fputs ($fp, $header);
+
+    /* Time offset for correct timezone */
+    function timezone () {
+       global $invert_time;
     
-    return $headerlength;
+       $diff_second = date('Z');
+       if ($invert_time) {
+           $diff_second = - $diff_second;
+       }
+       if ($diff_second > 0) {
+           $sign = '+';
+       } else {
+           $sign = '-';
+       }
+       $diff_second = abs($diff_second);
+       $diff_hour = floor ($diff_second / 3600);
+       $diff_minute = floor (($diff_second-3600*$diff_hour) / 60);
+       $zonename = '('.strftime('%Z').')';
+       $result = sprintf ("%s%02d%02d %s", $sign, $diff_hour, $diff_minute, 
+                       $zonename);
+       return ($result);
     }
 
-    /*
-    * function for cleanly folding of headerlines
-    */
-    function foldLine($line, $length, $pre) {
-    $cnt = strlen($line);
-    $res = '';
-    if ($cnt > $lenght)
-    {
-        $fold_string = $pre.' '."\r\n";
-        for ($i=0;$i<($cnt-$length);$i++)
-       {
-            $fold_pos = 0;
-           /* first try to fold at delimiters */
-            for ($j=($i+$length); $j>$i; $j--)
-            {
-                switch ($line{$j})
-               {
-               case (','):
-               case (';'):
-                    $fold_pos = $j;
-                   break;
-               default:
-                   break;
-               }
-               if ($fold_pos)
-               {
-                   $j=$i;
-               }
-           }
-           if (!$fold_pos)
-           {
-                /* not succeed yet so we try at spaces and = */
-                for ($j=($i+$length); $j>$i; $j--)
-                {
-                    switch ($line{$j})
-                   {
-                   case (' '):
-                   case ('='):
-                        $fold_pos = $j;
-                       break;
-                   default:
-                       break;
-                   }
-                   if ($fold_pos)
-                   {
-                       $j=$i;
-                   }
-               }
-           }
-           if (!$fold_pos)
-           {
-              /* clean folding didn't work */
-              $fold_pos = $i+$length;
-           }
-           $line = substr_replace($line,$line{$fold_pos}.$fold_string,$fold_pos,1);
-           $cnt += strlen($fold_string);
-           $i = $j + strlen($fold_string);
-        }          
+    function calculate_references($hdr) {
+        $refer = $hdr->references;
+       $message_id = $hdr->message_id;
+       $in_reply_to = $hdr->in_reply_to;
+       if (strlen($refer) > 2) {
+           $refer .= ' ' . $message_id;
+       } else {
+           if ($in_reply_to) {
+               $refer .= $in_reply_to . ' ' . $message_id;
+           } else {
+               $refer .= $message_id;
+           }                        
+       }
+       trim($refer);
+       return $refer;
     }
-    return $line;
-    }     
 }
 ?>
-