1 Index: roundcube-0.1~rc2/program/steps/mail/sendmail.inc
2 ===================================================================
3 --- a/program/steps/mail/sendmail.inc~ 2008-04-30 10:21:42.000000000 +0200
4 +++ a/program/steps/mail/sendmail.inc 2008-06-22 13:51:33.000000000 +0200
9 - $searchstr = 'program/js/tiny_mce/plugins/emotions/images/';
10 + $searchstr = 'program/js/tiny_mce/plugins/emotions/img/';
12 // keep track of added images, so they're only added once
13 $included_images = array();
14 --- roundcube-0.1~rc2.orig/program/steps/mail/sendmail.inc 2007-11-26 11:42:36.000000000 +0100
15 +++ roundcube-0.1~rc2/program/steps/mail/sendmail.inc 2007-11-26 11:44:04.000000000 +0100
17 if (! in_array($image_name, $included_images))
19 // add the image to the MIME message
20 - $img_file = INSTALL_PATH . '/' . $searchstr . $image_name;
21 + $img_file = '/usr/share/tinymce/www/plugins/emotions/img/' . $image_name;
22 - if(! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, '_' . $image_name))
23 + if(! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, $image_name))
24 $OUTPUT->show_message("emoticonerror", 'error');
26 --- a/program/steps/mail/sendmail.inc~ 2008-04-30 10:21:42.000000000 +0200
27 +++ a/program/steps/mail/sendmail.inc 2008-06-22 14:10:24.000000000 +0200
29 array_push($included_images, $image_name);
32 - $body = $body_pre . 'cid:_' . $image_name . $body_post;
33 + $body = $body_pre . $img_file . $body_post;
35 $last_img_pos = $pos2;