diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-04-12 13:54:45 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-04-12 13:54:45 +0000 |
| commit | 83a4e859f8ae505f06c184eb60577529ff6c4be8 (patch) | |
| tree | eea0a263dd79a697205db95f0a3b5600e6aa70c9 /roundcubemail/program/steps/mail/sendmail.inc | |
| parent | 1d297be10effab84c7e084bfc70651f99b10e91b (diff) | |
Changed codebase to PHP5 with autoloader + added some new classes from the devel-vnext branch
git-svn-id: https://svn.roundcube.net/trunk@1291 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/mail/sendmail.inc')
| -rw-r--r-- | roundcubemail/program/steps/mail/sendmail.inc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/roundcubemail/program/steps/mail/sendmail.inc b/roundcubemail/program/steps/mail/sendmail.inc index 5466d710c..2281a9773 100644 --- a/roundcubemail/program/steps/mail/sendmail.inc +++ b/roundcubemail/program/steps/mail/sendmail.inc @@ -5,7 +5,7 @@ | program/steps/mail/sendmail.inc | | | | This file is part of the RoundCube Webmail client | - | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland | + | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland | | Licensed under the GNU GPL | | | | PURPOSE: | @@ -21,11 +21,6 @@ */ -//require_once('lib/smtp.inc'); -require_once('lib/html2text.inc'); -require_once('lib/rc_mail_mime.inc'); - - if (!isset($_SESSION['compose']['id'])) { rcmail_overwrite_action('list'); @@ -70,7 +65,7 @@ function rcmail_get_identity($id) */ function rcmail_attach_emoticons(&$mime_message) { - global $CONFIG, $INSTALL_PATH; + global $CONFIG; $htmlContents = $mime_message->getHtmlBody(); @@ -100,7 +95,7 @@ function rcmail_attach_emoticons(&$mime_message) if (! in_array($image_name, $included_images)) { // add the image to the MIME message - $img_file = $INSTALL_PATH . '/' . $searchstr . $image_name; + $img_file = INSTALL_PATH . '/' . $searchstr . $image_name; if(! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, '_' . $image_name)) $OUTPUT->show_message("emoticonerror", 'error'); @@ -237,7 +232,7 @@ $isHtmlVal = strtolower(get_input_value('_is_html', RCUBE_INPUT_POST)); $isHtml = ($isHtmlVal == "1"); // create extended PEAR::Mail_mime instance -$MAIL_MIME = new rc_mail_mime(rcmail_header_delm()); +$MAIL_MIME = new rcube_mail_mime(rcmail_header_delm()); // For HTML-formatted messages, construct the MIME message with both // the HTML part and the plain-text part |