From 50844277ca2ce9b98f5d732b07ffe7a4627ff72c Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 1 Jul 2006 12:38:38 +0000
Subject: Changed label and icon for attachment removal and some styles

---
 program/steps/mail/compose.inc  | 12 ++++++++++--
 program/steps/mail/sendmail.inc |  2 +-
 program/steps/mail/upload.inc   |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'program/steps/mail')

diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 6d4cf9a61..64b0d6364 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -626,12 +626,20 @@ function rcmail_compose_attachment_list($attrib)
   if (is_array($_SESSION['compose']['attachments']))
     {
     if ($attrib['deleteicon'])
-      $button = sprintf('<img src="%s%s" alt="%s" border="0" / style="padding-right:2px;vertical-align:middle">', $CONFIG['skin_path'], $attrib['deleteicon'], rcube_label('delete'));
+      $button = sprintf('<img src="%s%s" alt="%s" border="0" / style="padding-right:2px;vertical-align:middle">',
+                        $CONFIG['skin_path'],
+                        $attrib['deleteicon'],
+                        rcube_label('delete'));
     else
       $button = rcube_label('delete');
 
     foreach ($_SESSION['compose']['attachments'] as $i => $a_prop)
-      $out .= sprintf('<li id="%s"><a href="#" onclick="%s.command(\'remove-attachment\',\'%s\')" title="%s">%s</a>%s</li>', $a_prop['name'], $JS_OBJECT_NAME, $a_prop['name'], rcube_label('deletefolder'),  $button, $a_prop['name']); 
+      $out .= sprintf('<li id="%s"><a href="#" onclick="%s.command(\'remove-attachment\',\'%s\')" title="%s">%s</a>%s</li>',
+                      $a_prop['name'],
+                      $JS_OBJECT_NAME,
+                      $a_prop['name'],
+                      rcube_label('delete'), 
+                      $button, $a_prop['name']); 
     }
 
   $OUTPUT->add_script(sprintf("%s.gui_object('attachmentlist', '%s');", $JS_OBJECT_NAME, $attrib['id']));  
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index a57f2d4ed..33c1a405e 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -114,7 +114,7 @@ if (empty($identity_arr['string']))
 // compose headers array
 $headers = array('Date' => date('D, j M Y G:i:s O'),
                  'From' => $identity_arr['string'],
-                 'To'   => $mailto);
+                 'To'   => rcube_charset_convert($mailto, $input_charset, $message_charset));
 
 // additional recipients
 if (!empty($_POST['_cc']))
diff --git a/program/steps/mail/upload.inc b/program/steps/mail/upload.inc
index 7fe7d3dcc..39164bb46 100644
--- a/program/steps/mail/upload.inc
+++ b/program/steps/mail/upload.inc
@@ -46,7 +46,7 @@ foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath)
                                                   'path' => $tmpfname);
 
     $button = sprintf('<img src="%s/images/icons/remove-attachment.png" alt="%s" border="0" style="padding-right:2px;vertical-align:middle">', $CONFIG['skin_path'], rcube_label('delete'));
-    $content = sprintf('<a href="#" onclick="%s.command(\\\'remove-attachment\\\',\\\'%s\\\')" title="%s">%s</a>%s',$JS_OBJECT_NAME, $_FILES['_attachments']['name'][$i], rcube_label('deletefolder'), $button, $_FILES['_attachments']['name'][$i]);
+    $content = sprintf('<a href="#" onclick="%s.command(\\\'remove-attachment\\\',\\\'%s\\\')" title="%s">%s</a>%s',$JS_OBJECT_NAME, $_FILES['_attachments']['name'][$i], rcube_label('delete'), $button, $_FILES['_attachments']['name'][$i]);
     $response .= sprintf('parent.%s.add2attachment_list(\'%s\',\'%s\');',$JS_OBJECT_NAME, $_FILES['_attachments']['name'][$i], $content);
     }
   }
-- 
cgit v1.2.3