Changeset 1532 in subversion for trunk/roundcubemail/program/steps/mail/sendmail.inc

Timestamp:

Jun 14, 2008 8:23:08 AM (5 years ago)

Author:

thomasb

Message:

More code cleanup

File:

• trunk/roundcubemail/program/steps/mail/sendmail.inc (modified) (3 diffs)

trunk/roundcubemail/program/steps/mail/sendmail.inc

@@ -114 +114 @@
   $olddraftmessageid = get_input_value('_draft_saveid', RCUBE_INPUT_POST);
 
-$message_id = sprintf('<%s@%s>', md5(uniqid('rcmail'.rand(),true)), rcmail_mail_domain($_SESSION['imap_host']));
+$message_id = sprintf('<%s@%s>', md5(uniqid('rcmail'.rand(),true)), $RCMAIL->config->mail_domain($_SESSION['imap_host']));
 $savedraft = !empty($_POST['_draft']) ? TRUE : FALSE;
 
@@ -208 +208 @@
 if ($CONFIG['http_received_header'])
 {
-  $nldlm = rcmail_header_delm() . "\t";
+  $nldlm = $RCMAIL->config->header_delimiter() . "\t";
   $headers['Received'] =  wordwrap('from ' . (isset($_SERVER['HTTP_X_FORWARDED_FOR']) ?
       gethostbyaddr($_SERVER['HTTP_X_FORWARDED_FOR']).' ['.$_SERVER['HTTP_X_FORWARDED_FOR'].']'.$nldlm.' via ' : '') .
@@ -233 +233 @@
 
 // create extended PEAR::Mail_mime instance
-$MAIL_MIME = new rcube_mail_mime(rcmail_header_delm());
+$MAIL_MIME = new rcube_mail_mime($RCMAIL->config->header_delimiter());
 
 // For HTML-formatted messages, construct the MIME message with both