Fix saving/sending emoticon images when assets_dir is set (Kolab #4608)

pull/257/head
Aleksander Machniak 10 years ago
parent 3e0ad293e1
commit d67071f228

@ -766,6 +766,8 @@ function rcmail_fix_emoticon_paths($mime_message)
$body = preg_replace('/\x00/', '', $body);
$searchstr = 'program/js/tinymce/plugins/emoticons/img/';
$assets_dir = $RCMAIL->config->get('assets_dir');
$path = ($assets_dir ?: INSTALL_PATH) . '/' . $searchstr;
$offset = 0;
// keep track of added images, so they're only added once
@ -779,12 +781,14 @@ function rcmail_fix_emoticon_paths($mime_message)
// sanitize image name so resulting attachment doesn't leave images dir
$image_name = preg_replace('/[^a-zA-Z0-9_\.\-]/i', '', $image_name);
$img_file = INSTALL_PATH . '/' . $searchstr . $image_name;
$img_file = $path . $image_name;
if (! in_array($image_name, $included_images)) {
if (!in_array($image_name, $included_images)) {
// add the image to the MIME message
if (!$mime_message->addHTMLImage($img_file, 'image/gif', '', true, $image_name)) {
$res = $mime_message->addHTMLImage($img_file, 'image/gif', '', true, $image_name);
if (PEAR::isError($res)) {
$RCMAIL->output->show_message("emoticonerror", 'error');
continue;
}
array_push($included_images, $image_name);

Loading…
Cancel
Save