]> git.donarmstrong.com Git - roundcube.git/blobdiff - program/steps/mail/compose.inc
Imported Upstream version 0.2~alpha
[roundcube.git] / program / steps / mail / compose.inc
index bab8d3d509e552b3fd5b6120416128f2fca30f74..f24c119dd9d046b61770a0603044e4b10a247a4a 100644 (file)
@@ -5,7 +5,7 @@
  | program/steps/mail/compose.inc                                        |
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: compose.inc 297 2006-08-06 15:55:11Z thomasb $
+ $Id: compose.inc 1493 2008-06-08 18:17:09Z alec $
 
 */
 
+// define constants for message compose mode
+define('RCUBE_COMPOSE_REPLY', 0x0106);
+define('RCUBE_COMPOSE_FORWARD', 0x0107);
+define('RCUBE_COMPOSE_DRAFT', 0x0108);
 
-require_once('Mail/mimeDecode.php');
 
 // remove an attachment
-if ($_action=='remove-attachment' && preg_match('/^rcmfile([0-9]+)$/', $_GET['_file'], $regs))
-  {
+if ($RCMAIL->action=='remove-attachment' && preg_match('/^rcmfile([0-9]+)$/', $_POST['_file'], $regs))
+{
   $id = $regs[1];
   if (is_array($_SESSION['compose']['attachments'][$id]))
-    {
+  {
     @unlink($_SESSION['compose']['attachments'][$id]['path']);
     $_SESSION['compose']['attachments'][$id] = NULL;
-    $commands = sprintf("parent.%s.remove_from_attachment_list('rcmfile%d');\n", $JS_OBJECT_NAME, $id);
-    rcube_remote_response($commands);  
+    $OUTPUT->command('remove_from_attachment_list', "rcmfile$id");
+    $OUTPUT->send();
     exit;
-    }
   }
+}
 
+if ($RCMAIL->action=='display-attachment' && preg_match('/^rcmfile([0-9]+)$/', $_GET['_file'], $regs))
+{
+  $id = $regs[1];
+  if (is_array($_SESSION['compose']['attachments'][$id]))
+  {
+    $apath = $_SESSION['compose']['attachments'][$id]['path'];
+    header('Content-Type: ' . $_SESSION['compose']['attachments'][$id]['mimetype']);
+    header('Content-Length: ' . filesize($apath));
+    readfile($apath);
+  }
+  exit;
+}
 
 $MESSAGE_FORM = NULL;
-$REPLY_MESSAGE = NULL;
-$FORWARD_MESSAGE = NULL;
-$DRAFT_MESSAGE = NULL;
+$MESSAGE = NULL;
 
-// nothing below is called during message composition, only at "new/forward/reply/draft" initialization
-// since there are many ways to leave the compose page improperly, it seems necessary to clean-up an old
+// Nothing below is called during message composition, only at "new/forward/reply/draft" initialization or
+// if a compose-ID is given (i.e. when the compose step is opened in a new window/tab).
+// Since there are many ways to leave the compose page improperly, it seems necessary to clean-up an old
 // compose when a "new/forward/reply/draft" is called - otherwise the old session attachments will appear
 
-rcmail_compose_cleanup();
-$_SESSION['compose'] = array('id' => uniqid(rand()));
+if (!is_array($_SESSION['compose']) || $_SESSION['compose']['id'] != get_input_value('_id', RCUBE_INPUT_GET))
+{
+  rcmail_compose_cleanup();
+  $_SESSION['compose'] = array('id' => uniqid(rand()));
+}
 
 // add some labels to client
-rcube_add_label('nosubject', 'norecipientwarning', 'nosubjectwarning', 'nobodywarning', 'notsentwarning', 'savingmessage', 'sendingmessage', 'messagesaved');
+rcube_add_label('nosubject', 'norecipientwarning', 'nosubjectwarning', 'nobodywarning', 'notsentwarning', 'savingmessage', 'sendingmessage', 'messagesaved', 'converting');
 
+// add config parameter to client script
+$OUTPUT->set_env('draft_autosave', !empty($CONFIG['drafts_mbox']) ? $CONFIG['draft_autosave'] : 0);
 
-if ($_GET['_reply_uid'] || $_GET['_forward_uid'] || $_GET['_draft_uid'])
-  {
-  $msg_uid = ($_GET['_reply_uid'] ? $_GET['_reply_uid'] : ($_GET['_forward_uid'] ? $_GET['_forward_uid'] : $_GET['_draft_uid']));
 
+// get reference message and set compose mode
+if ($msg_uid = get_input_value('_reply_uid', RCUBE_INPUT_GET))
+  $compose_mode = RCUBE_COMPOSE_REPLY;
+else if ($msg_uid = get_input_value('_forward_uid', RCUBE_INPUT_GET))
+  $compose_mode = RCUBE_COMPOSE_FORWARD;
+else if ($msg_uid = get_input_value('_draft_uid', RCUBE_INPUT_GET))
+  $compose_mode = RCUBE_COMPOSE_DRAFT;
+
+if (!empty($msg_uid))
+{
   // similar as in program/steps/mail/show.inc
-  $MESSAGE = array();
-  $MESSAGE['headers'] = $IMAP->get_headers($msg_uid);
+  $MESSAGE = new rcube_message($msg_uid);
   
-  $MESSAGE['source'] = rcmail_message_source($msg_uid);
-  
-  $mmd = new Mail_mimeDecode($MESSAGE['source']);
-  $MESSAGE['structure'] = $mmd->decode(array('include_bodies' => TRUE,
-                                             'decode_headers' => TRUE,
-                                             'decode_bodies' => FALSE));
-
-  $MESSAGE['subject'] = $IMAP->decode_header($MESSAGE['headers']->subject);
-  $MESSAGE['parts'] = $mmd->getMimeNumbers($MESSAGE['structure']);
-
-  if ($_GET['_reply_uid'])
-    {
-    $REPLY_MESSAGE = &$MESSAGE;
-    $_SESSION['compose']['reply_uid'] = $_GET['_reply_uid'];
-    $_SESSION['compose']['reply_msgid'] = $REPLY_MESSAGE['headers']->messageID;
-    $_SESSION['compose']['references']  = $REPLY_MESSAGE['headers']->reference;
-    $_SESSION['compose']['references'] .= !empty($REPLY_MESSAGE['headers']->reference) ? ' ' : '';
-    $_SESSION['compose']['references'] .= $REPLY_MESSAGE['headers']->messageID;
-
-    if ($_GET['_all'])
-      $REPLY_MESSAGE['reply_all'] = 1;
-
-    }
-  else if ($_GET['_forward_uid'])
-    {
-    $FORWARD_MESSAGE = $MESSAGE;
-    $_SESSION['compose']['forward_uid'] = $_GET['_forward_uid'];
-    }
-  else
-    {
-    $DRAFT_MESSAGE = $MESSAGE;
-    $_SESSION['compose']['draft_uid'] = $_GET['_draft_uid'];
-    }
+  if (!empty($MESSAGE->headers->charset))
+    $IMAP->set_charset($MESSAGE->headers->charset);
+    
+  if ($compose_mode == RCUBE_COMPOSE_REPLY)
+  {
+    $_SESSION['compose']['reply_uid'] = $msg_uid;
+    $_SESSION['compose']['reply_msgid'] = $MESSAGE->headers->messageID;
+    $_SESSION['compose']['references']  = trim($MESSAGE->headers->references . " " . $MESSAGE->headers->messageID);
 
+    if (!empty($_GET['_all']))
+      $MESSAGE->reply_all = 1;
   }
+  else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
+  {
+    $_SESSION['compose']['forward_uid'] = $msg_uid;
+  }
+  else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
+  {
+    $_SESSION['compose']['draft_uid'] = $msg_uid;
+  }
+}
 
 /****** compose mode functions ********/
 
 
 function rcmail_compose_headers($attrib)
-  {
-  global $IMAP, $REPLY_MESSAGE, $DRAFT_MESSAGE, $DB;
+{
+  global $IMAP, $MESSAGE, $DB, $compose_mode;
   static $sa_recipients = array();
 
   list($form_start, $form_end) = get_form_tags($attrib);
@@ -111,115 +122,98 @@ function rcmail_compose_headers($attrib)
   $part = strtolower($attrib['part']);
   
   switch ($part)
-    {
+  {
     case 'from':
       return rcmail_compose_header_from($attrib);
 
     case 'to':
       $fname = '_to';
       $header = 'to';
-
-      // we have contact id's as get parameters
-      if (!empty($_GET['_to']) && preg_match('/^[0-9]+(,[0-9]+)*$/', $_GET['_to']))
-        {
-        $a_recipients = array();
-        $sql_result = $DB->query("SELECT name, email
-                                  FROM ".get_table_name('contacts')."
-                                  WHERE user_id=?
-                                  AND    del<>1
-                                  AND    contact_id IN (".$_GET['_to'].")",
-                                  $_SESSION['user_id']);
-                                         
-        while ($sql_arr = $DB->fetch_assoc($sql_result))
-          $a_recipients[] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
-          
-        if (sizeof($a_recipients))
-          $fvalue = join(', ', $a_recipients);
-        }
+      
+      // we have a set of recipients stored is session
+      if (($mailto_id = get_input_value('_mailto', RCUBE_INPUT_GET)) && $_SESSION['mailto'][$mailto_id])
+        $fvalue = $_SESSION['mailto'][$mailto_id];
       else if (!empty($_GET['_to']))
-        $fvalue = $_GET['_to'];
+        $fvalue = get_input_value('_to', RCUBE_INPUT_GET);
         
     case 'cc':
       if (!$fname)
-        {
+      {
         $fname = '_cc';
         $header = 'cc';
-        }
+      }
     case 'bcc':
       if (!$fname)
+      {
         $fname = '_bcc';
+        $header = 'bcc';
+      }
         
-      $allow_attrib = array('id', 'class', 'style', 'cols', 'rows', 'wrap', 'tabindex');
-      $field_type = 'textarea';            
+      $allow_attrib = array('id', 'class', 'style', 'cols', 'rows', 'tabindex');
+      $field_type = 'html_textarea';
       break;
 
     case 'replyto':
     case 'reply-to':
       $fname = '_replyto';
       $allow_attrib = array('id', 'class', 'style', 'size', 'tabindex');
-      $field_type = 'textfield';
-      break;
-    
-    }
+      $field_type = 'html_inputfield';
+      break;    
+  }
  
   if ($fname && !empty($_POST[$fname]))
     $fvalue = get_input_value($fname, RCUBE_INPUT_POST, TRUE);
-  else if ($header && is_object($REPLY_MESSAGE['headers']))
-    {
+
+  else if ($header && $compose_mode == RCUBE_COMPOSE_REPLY)
+  {
     // get recipent address(es) out of the message headers
-    if ($header=='to' && $REPLY_MESSAGE['headers']->replyto)
-      $fvalue = $IMAP->decode_header($REPLY_MESSAGE['headers']->replyto);
+    if ($header=='to' && !empty($MESSAGE->headers->replyto))
+      $fvalue = $MESSAGE->headers->replyto;
 
-    else if ($header=='to' && $REPLY_MESSAGE['headers']->from)
-      $fvalue = $IMAP->decode_header($REPLY_MESSAGE['headers']->from);
+    else if ($header=='to' && !empty($MESSAGE->headers->from))
+      $fvalue = $MESSAGE->headers->from;
 
     // add recipent of original message if reply to all
-    else if ($header=='cc' && $REPLY_MESSAGE['reply_all'])
-      {
-      if ($IMAP->decode_header($REPLY_MESSAGE['headers']->to))
-        $fvalue .= $IMAP->decode_header($REPLY_MESSAGE['headers']->to);
-
-      if ($IMAP->decode_header($REPLY_MESSAGE['headers']->cc))
-        {
-        if($fvalue)
-          $fvalue .= ', ';
+    else if ($header=='cc' && !empty($MESSAGE->reply_all))
+    {
+      if ($v = $MESSAGE->headers->to)
+        $fvalue .= $v;
 
-        $fvalue .= $IMAP->decode_header($REPLY_MESSAGE['headers']->cc);
-        }
-      }
+      if ($v = $MESSAGE->headers->cc)
+        $fvalue .= (!empty($fvalue) ? ', ' : '') . $v;
+    }
 
     // split recipients and put them back together in a unique way
     if (!empty($fvalue))
-      {
+    {
       $to_addresses = $IMAP->decode_address_list($fvalue);
       $fvalue = '';
       foreach ($to_addresses as $addr_part)
+      {
+        if (!empty($addr_part['mailto']) && !in_array($addr_part['mailto'], $sa_recipients) && (!$MESSAGE->compose_from || !in_array($addr_part['mailto'], $MESSAGE->compose_from)))
         {
-        if (!in_array($addr_part['mailto'], $sa_recipients) && (!$REPLY_MESSAGE['FROM'] || !in_array($addr_part['mailto'], $REPLY_MESSAGE['FROM'])))
-          {
           $fvalue .= (strlen($fvalue) ? ', ':'').$addr_part['string'];
           $sa_recipients[] = $addr_part['mailto'];
-          }
         }
       }
     }
-  else if ($header && is_object($DRAFT_MESSAGE['headers']))
-    {
+  }
+  else if ($header && $compose_mode == RCUBE_COMPOSE_DRAFT)
+  {
     // get drafted headers
-    if ($header=='to' && $DRAFT_MESSAGE['headers']->to)
-      $fvalue = $IMAP->decode_header($DRAFT_MESSAGE['headers']->to);
-
-    if ($header=='cc' && $DRAFT_MESSAGE['headers']->cc)
-      $fvalue = $IMAP->decode_header($DRAFT_MESSAGE['headers']->cc);
+    if ($header=='to' && !empty($MESSAGE->headers->to))
+      $fvalue = $MESSAGE->get_header('to');
 
-    if ($header=='bcc' && $DRAFT_MESSAGE['headers']->bcc)
-      $fvalue = $IMAP->decode_header($DRAFT_MESSAGE['headers']->bcc);
+    if ($header=='cc' && !empty($MESSAGE->headers->cc))
+      $fvalue = $MESSAGE->get_header('cc');
 
-    }
+    if ($header=='bcc' && !empty($MESSAGE->headers->bcc))
+      $fvalue = $MESSAGE->get_header('bcc');
+  }
 
         
   if ($fname && $field_type)
-    {
+  {
     // pass the following attributes to the form class
     $field_attrib = array('name' => $fname);
     foreach ($attrib as $attr => $value)
@@ -228,20 +222,20 @@ function rcmail_compose_headers($attrib)
 
     // create teaxtarea object
     $input = new $field_type($field_attrib);
-    $out = $input->show($fvalue);    
-    }
+    $out = $input->show($fvalue);
+  }
   
   if ($form_start)
     $out = $form_start.$out;
 
   return $out;  
-  }
+}
 
 
 
 function rcmail_compose_header_from($attrib)
-  {
-  global $IMAP, $REPLY_MESSAGE, $DRAFT_MESSAGE, $DB, $OUTPUT, $JS_OBJECT_NAME;
+{
+  global $IMAP, $MESSAGE, $DB, $USER, $OUTPUT, $compose_mode;
     
   // pass the following attributes to the form class
   $field_attrib = array('name' => '_from');
@@ -251,323 +245,349 @@ function rcmail_compose_header_from($attrib)
 
   // extract all recipients of the reply-message
   $a_recipients = array();
-  if ($REPLY_MESSAGE && is_object($REPLY_MESSAGE['headers']))
-    {
-    $REPLY_MESSAGE['FROM'] = array();
+  if ($compose_mode == RCUBE_COMPOSE_REPLY && is_object($MESSAGE->headers))
+  {
+    $MESSAGE->compose_from = array();
 
-    $a_to = $IMAP->decode_address_list($REPLY_MESSAGE['headers']->to);        
+    $a_to = $IMAP->decode_address_list($MESSAGE->headers->to);
     foreach ($a_to as $addr)
-      {
+    {
       if (!empty($addr['mailto']))
         $a_recipients[] = $addr['mailto'];
-      }
+    }
 
-    if (!empty($REPLY_MESSAGE['headers']->cc))
-      {
-      $a_cc = $IMAP->decode_address_list($REPLY_MESSAGE['headers']->cc);
+    if (!empty($MESSAGE->headers->cc))
+    {
+      $a_cc = $IMAP->decode_address_list($MESSAGE->headers->cc);
       foreach ($a_cc as $addr)
-        {
+      {
         if (!empty($addr['mailto']))
           $a_recipients[] = $addr['mailto'];
-        }
       }
     }
+  }
 
   // get this user's identities
-  $sql_result = $DB->query("SELECT identity_id, name, email, signature
-                            FROM   ".get_table_name('identities')."
-                            WHERE user_id=?
-                            AND    del<>1
-                            ORDER BY ".$DB->quoteIdentifier('standard')." DESC, name ASC",
-                           $_SESSION['user_id']);
-                                   
+  $sql_result = $USER->list_identities();
+
   if ($DB->num_rows($sql_result))
-    {
+  {
     $from_id = 0;
     $a_signatures = array();
-    
-    $field_attrib['onchange'] = "$JS_OBJECT_NAME.change_identity(this)";
-    $select_from = new select($field_attrib);
-    
+
+    $field_attrib['onchange'] = JS_OBJECT_NAME.".change_identity(this)";
+    $select_from = new html_select($field_attrib);
+
     while ($sql_arr = $DB->fetch_assoc($sql_result))
-      {
-      $select_from->add(format_email_recipient($sql_arr['email'], $sql_arr['name']), $sql_arr['identity_id']);
+    {
+      $identity_id = $sql_arr['identity_id'];
+      $select_from->add(format_email_recipient($sql_arr['email'], $sql_arr['name']), $identity_id);
 
       // add signature to array
       if (!empty($sql_arr['signature']))
-        $a_signatures[$sql_arr['identity_id']] = $sql_arr['signature'];
-      
+      {
+        $a_signatures[$identity_id]['text'] = $sql_arr['signature'];
+        $a_signatures[$identity_id]['is_html'] = ($sql_arr['html_signature'] == 1) ? true : false;
+        if ($a_signatures[$identity_id]['is_html'])
+        {
+            $h2t = new html2text($a_signatures[$identity_id]['text'], false, false);
+            $plainTextPart = $h2t->get_text();
+            $a_signatures[$identity_id]['plain_text'] = trim(html_entity_decode($plainTextPart, ENT_NOQUOTES, 'UTF-8'));
+        }
+      }
+
       // set identity if it's one of the reply-message recipients
       if (in_array($sql_arr['email'], $a_recipients))
         $from_id = $sql_arr['identity_id'];
-        
-      if ($REPLY_MESSAGE && is_array($REPLY_MESSAGE['FROM']))
-        $REPLY_MESSAGE['FROM'][] = $sql_arr['email'];
 
-      if (strstr($DRAFT_MESSAGE['headers']->from,$sql_arr['email']))
-        $from_id = $sql_arr['identity_id'];
+      if ($compose_mode == RCUBE_COMPOSE_REPLY && is_array($MESSAGE->compose_from))
+        $MESSAGE->compose_from[] = $sql_arr['email'];
 
-      }
+      if ($compose_mode == RCUBE_COMPOSE_DRAFT && strstr($MESSAGE->headers->from, $sql_arr['email']))
+        $from_id = $sql_arr['identity_id'];
+    }
 
     // overwrite identity selection with post parameter
     if (isset($_POST['_from']))
-      $from_id = $_POST['_from'];
+      $from_id = get_input_value('_from', RCUBE_INPUT_POST);
 
     $out = $select_from->show($from_id);
-    
 
     // add signatures to client
-    $OUTPUT->add_script(sprintf("%s.set_env('signatures', %s);", $JS_OBJECT_NAME, array2js($a_signatures)));  
-    }
+    $OUTPUT->set_env('signatures', $a_signatures);
+  }
   else
-    {
-    $input_from = new textfield($field_attrib);
+  {
+    $input_from = new html_inputfield($field_attrib);
     $out = $input_from->show($_POST['_from']);
-    }
+  }
   
   if ($form_start)
     $out = $form_start.$out;
 
   return $out;
-  }
+}
 
-  
 
 function rcmail_compose_body($attrib)
-  {
-  global $CONFIG, $OUTPUT, $REPLY_MESSAGE, $FORWARD_MESSAGE, $DRAFT_MESSAGE, $JS_OBJECT_NAME;
+{
+  global $RCMAIL, $CONFIG, $OUTPUT, $MESSAGE, $compose_mode;
   
   list($form_start, $form_end) = get_form_tags($attrib);
   unset($attrib['form']);
   
   if (empty($attrib['id']))
     $attrib['id'] = 'rcmComposeMessage';
-  
+
   $attrib['name'] = '_message';
-  $textarea = new textarea($attrib);
+
+  if ($CONFIG['htmleditor'])
+    $isHtml = true;
+  else
+    $isHtml = false;
 
   $body = '';
-  
+
   // use posted message body
   if (!empty($_POST['_message']))
-    $body = get_input_value('_message', RCUBE_INPUT_POST, TRUE);
-    
-  // compose reply-body
-  else if (is_array($REPLY_MESSAGE['parts']))
+  {
+    $body = get_input_value('_message', RCUBE_INPUT_POST, true);
+  }
+  else if ($compose_mode)
+  {
+    if ($isHtml && $MESSAGE->has_html_part())
     {
-    $body = rcmail_first_text_part($REPLY_MESSAGE['parts']);
-    if (strlen($body))
-      $body = rcmail_create_reply_body($body);
+      $body = $MESSAGE->first_html_part();
+      $isHtml = true;
     }
-
-  // forward message body inline
-  else if (is_array($FORWARD_MESSAGE['parts']))
+    else
     {
-    $body = rcmail_first_text_part($FORWARD_MESSAGE['parts']);
-    if (strlen($body))
-      $body = rcmail_create_forward_body($body);
+      $body = $MESSAGE->first_text_part();
+      $isHtml = false;
     }
+    
+    // compose reply-body
+    if ($compose_mode == RCUBE_COMPOSE_REPLY)
+      $body = rcmail_create_reply_body($body, $isHtml);
+    // forward message body inline
+    else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
+      $body = rcmail_create_forward_body($body, $isHtml);
+    // load draft message body
+    else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
+      $body = rcmail_create_draft_body($body, $isHtml);
+  }
+
+  $tinylang = substr($_SESSION['language'], 0, 2);
+  if (!file_exists('program/js/tiny_mce/langs/'.$tinylang.'.js'))
+    $tinylang = 'en'; 
+
+  $OUTPUT->include_script('tiny_mce/tiny_mce.js');
+  $OUTPUT->include_script("editor.js");
+  $OUTPUT->add_script('rcmail_editor_init("$__skin_path", "'.$tinylang.'");');
 
-  // forward message body inline
-  else if (is_array($DRAFT_MESSAGE['parts']))
-    {
-    $body = rcmail_first_text_part($DRAFT_MESSAGE['parts']);
-    if (strlen($body))
-      $body = rcmail_create_draft_body($body);
-    }
-  
   $out = $form_start ? "$form_start\n" : '';
 
-  $saveid = new hiddenfield(array('name' => '_draft_saveid', 'value' => str_replace(array('<','>'),"",$DRAFT_MESSAGE['headers']->messageID) ));
+  $saveid = new html_hiddenfield(array('name' => '_draft_saveid', 'value' => $compose_mode==RCUBE_COMPOSE_DRAFT ? str_replace(array('<','>'), "", $MESSAGE->headers->messageID) : ''));
   $out .= $saveid->show();
 
-  $drafttoggle = new hiddenfield(array('name' => '_draft', 'value' => 'yes'));
+  $drafttoggle = new html_hiddenfield(array('name' => '_draft', 'value' => 'yes'));
   $out .= $drafttoggle->show();
 
+  $msgtype = new html_hiddenfield(array('name' => '_is_html', 'value' => ($isHtml?"1":"0")));
+  $out .= $msgtype->show();
+
+  // If desired, set this text area to be editable by TinyMCE
+  if ($isHtml) $attrib['class'] = "mce_editor";
+  $textarea = new html_textarea($attrib);
   $out .= $textarea->show($body);
   $out .= $form_end ? "\n$form_end" : '';
-  
+
   // include GoogieSpell
-  if (!empty($CONFIG['enable_spellcheck']))
+  if (!empty($CONFIG['enable_spellcheck']) && !$isHtml)
     {
+    $lang_set = '';
+    if (!empty($CONFIG['spellcheck_languages']) && is_array($CONFIG['spellcheck_languages']))
+      $lang_set = "googie.setLanguages(".array2js($CONFIG['spellcheck_languages']).");\n";
+    
     $OUTPUT->include_script('googiespell.js');
-    $OUTPUT->add_script(sprintf("var googie = new GoogieSpell('\$__skin_path/images/googiespell/','%s&_action=spell&lang=');\n".
-                                "googie.lang_chck_spell = \"%s\";\n".
-                                "googie.lang_rsm_edt = \"%s\";\n".
-                                "googie.lang_close = \"%s\";\n".
-                                "googie.lang_revert = \"%s\";\n".
-                                "googie.lang_no_error_found = \"%s\";\n".
-                                "googie.decorateTextarea('%s');\n".
-                                "%s.set_env('spellcheck', googie);",
-                                $GLOBALS['COMM_PATH'],
-                                rep_specialchars_output(rcube_label('checkspelling')),
-                                rep_specialchars_output(rcube_label('resumeediting')),
-                                rep_specialchars_output(rcube_label('close')),
-                                rep_specialchars_output(rcube_label('revertto')),
-                                rep_specialchars_output(rcube_label('nospellerrors')),
-                                $attrib['id'],
-                                $JS_OBJECT_NAME), 'foot');
+    $OUTPUT->add_script(sprintf(
+      "var googie = new GoogieSpell('\$__skin_path/images/googiespell/','%s&_action=spell&lang=');\n".
+      "googie.lang_chck_spell = \"%s\";\n".
+      "googie.lang_rsm_edt = \"%s\";\n".
+      "googie.lang_close = \"%s\";\n".
+      "googie.lang_revert = \"%s\";\n".
+      "googie.lang_no_error_found = \"%s\";\n%s".
+      "googie.setCurrentLanguage('%s');\n".
+      "googie.decorateTextarea('%s');\n".
+      "%s.set_env('spellcheck', googie);",
+      $RCMAIL->comm_path,
+      JQ(Q(rcube_label('checkspelling'))),
+      JQ(Q(rcube_label('resumeediting'))),
+      JQ(Q(rcube_label('close'))),
+      JQ(Q(rcube_label('revertto'))),
+      JQ(Q(rcube_label('nospellerrors'))),
+      $lang_set,
+      substr($_SESSION['language'], 0, 2),
+      $attrib['id'],
+      JS_OBJECT_NAME), 'foot');
 
     rcube_add_label('checking');
     }
  
-  $out .= "\n".'<iframe name="savetarget" src="program/blank.gif" style="width:0;height:0;visibility:hidden;"></iframe>';
+  $out .= "\n".'<iframe name="savetarget" src="program/blank.gif" style="width:0;height:0;border:none;visibility:hidden;"></iframe>';
 
   return $out;
-  }
+}
 
 
-function rcmail_create_reply_body($body)
-  {
-  global $IMAP, $REPLY_MESSAGE;
+function rcmail_create_reply_body($body, $bodyIsHtml)
+{
+  global $IMAP, $MESSAGE;
 
-  // soft-wrap message first
-  $body = wordwrap($body, 75);
+  if (! $bodyIsHtml)
+  {
+    // soft-wrap message first
+    $body = wordwrap($body, 75);
   
-  // split body into single lines
-  $a_lines = preg_split('/\r?\n/', $body);
+    // split body into single lines
+    $a_lines = preg_split('/\r?\n/', $body);
   
-  // add > to each line
-  for($n=0; $n<sizeof($a_lines); $n++)
+    // add > to each line
+    for($n=0; $n<sizeof($a_lines); $n++)
     {
-    if (strpos($a_lines[$n], '>')===0)
-      $a_lines[$n] = '>'.$a_lines[$n];
-    else
-      $a_lines[$n] = '> '.$a_lines[$n];
+      if (strpos($a_lines[$n], '>')===0)
+        $a_lines[$n] = '>'.$a_lines[$n];
+      else
+        $a_lines[$n] = '> '.$a_lines[$n];
     }
  
-  $body = join("\n", $a_lines);
-
-  // add title line
-  $pefix = sprintf("\n\n\nOn %s, %s wrote:\n",
-           $REPLY_MESSAGE['headers']->date,
-           $IMAP->decode_header($REPLY_MESSAGE['headers']->from));
-           
+    $body = join("\n", $a_lines);
 
-  // try to remove the signature
-  if ($sp = strrpos($body, '-- '))
-    {
-    if ($body{$sp+3}==' ' || $body{$sp+3}=="\n" || $body{$sp+3}=="\r")
-      $body = substr($body, 0, $sp-1);
-    }
+    // add title line
+    $prefix = sprintf("\n\n\nOn %s, %s wrote:\n",
+      $MESSAGE->headers->date,
+      $MESSAGE->get_header('from'));
 
-  return $pefix.$body;
+    // try to remove the signature
+    if ($sp = strrpos($body, '-- '))
+      {
+      if ($body{$sp+3}==' ' || $body{$sp+3}=="\n" || $body{$sp+3}=="\r")
+        $body = substr($body, 0, $sp-1);
+      }
+    $suffix = '';
+  }
+  else
+  {
+    $prefix = sprintf("<br /><br />On %s, %s wrote:<br />\n",
+      $MESSAGE->headers->date,
+      Q($MESSAGE->get_header('from')));
+    $prefix .= '<blockquote type="cite" style="padding-left:5px; border-left:#1010ff 2px solid; margin-left:5px; width:100%">';
+    $suffix = "</blockquote>";
   }
 
+  return $prefix.$body.$suffix;
+}
 
-function rcmail_create_forward_body($body)
-  {
-  global $IMAP, $FORWARD_MESSAGE;
 
-  // soft-wrap message first
-  $body = wordwrap($body, 80);
-  
-  $prefix = sprintf("\n\n\n-------- Original Message --------\nSubject: %s\nDate: %s\nFrom: %s\nTo: %s\n\n",
-                   $FORWARD_MESSAGE['subject'],
-                   $FORWARD_MESSAGE['headers']->date,
-                   $IMAP->decode_header($FORWARD_MESSAGE['headers']->from),
-                   $IMAP->decode_header($FORWARD_MESSAGE['headers']->to));
+function rcmail_create_forward_body($body, $bodyIsHtml)
+{
+  global $IMAP, $MESSAGE;
+
+  if (!$bodyIsHtml)
+  {
+    // soft-wrap message first
+    $body = wordwrap($body, 80);
+  
+    $prefix = sprintf("\n\n\n-------- Original Message --------\nSubject: %s\nDate: %s\nFrom: %s\nTo: %s\n\n",
+      $MESSAGE->subject,
+      $MESSAGE->headers->date,
+      $MESSAGE->get_header('from'),
+      $MESSAGE->get_header('to'));
+  }
+  else
+  {
+    $prefix = sprintf(
+      "<br><br>-------- Original Message --------" .
+        "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tbody>" .
+        "<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Subject: </th><td>%s</td></tr>" .
+        "<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Date: </th><td>%s</td></tr>" .
+        "<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">From: </th><td>%s</td></tr>" .
+        "<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">To: </th><td>%s</td></tr>" .
+        "</tbody></table><br>",
+      Q($MESSAGE->subject),
+      Q($MESSAGE->headers->date),
+      Q($MESSAGE->get_header('from')),
+      Q($MESSAGE->get_header('to')));
+  }
 
   // add attachments
-  if (!isset($_SESSION['compose']['forward_attachments']) && is_array($FORWARD_MESSAGE['parts']) && sizeof($FORWARD_MESSAGE['parts'])>1)
-    {
-    $temp_dir = rcmail_create_compose_tempdir();
+  if (!isset($_SESSION['compose']['forward_attachments']) && is_array($MESSAGE->mime_parts))
+    rcmail_write_compose_attachments($MESSAGE);
+    
+  return $prefix.$body;
+}
 
-    if (!is_array($_SESSION['compose']['attachments']))
-      $_SESSION['compose']['attachments'] = array();
-  
-    foreach ($FORWARD_MESSAGE['parts'] as $part)
-      {
-      if ($part->disposition=='attachment' || $part->disposition=='inline' || $part->headers['content-id'] ||
-               (empty($part->disposition) && ($part->d_parameters['filename'] || $part->ctype_parameters['name'])))
-        {
-        $tmp_path = tempnam($temp_dir, 'rcmAttmnt');
-        if ($fp = fopen($tmp_path, 'w'))
-          {
-          fwrite($fp, $IMAP->mime_decode($part->body, $part->headers['content-transfer-encoding']));
-          fclose($fp);
-
-          if ($part->d_parameters['filename'])
-            $_SESSION['compose']['attachments'][] = array('name' => $part->d_parameters['filename'],
-                                                          'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
-                                                          'path' => $tmp_path);
-                                   
-          else if ($part->ctype_parameters['name'])
-           $_SESSION['compose']['attachments'][] = array('name' => $part->ctype_parameters['name'],
-                                                          'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
-                                                          'path' => $tmp_path);
-                                                         
-          else if ($part->headers['content-description'])
-           $_SESSION['compose']['attachments'][] = array('name' => $part->headers['content-description'],
-                                                          'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
-                                                          'path' => $tmp_path);
-          }
-       }
-      }
 
-    $_SESSION['compose']['forward_attachments'] = TRUE;
-    }
+function rcmail_create_draft_body($body, $bodyIsHtml)
+{
+  global $MESSAGE;
+  
+  /**
+   * add attachments
+   * sizeof($MESSAGE->mime_parts can be 1 - e.g. attachment, but no text!
+   */
+  if (!isset($_SESSION['compose']['forward_attachments'])
+      && is_array($MESSAGE->mime_parts)
+      && count($MESSAGE->mime_parts) > 0)
+    rcmail_write_compose_attachments($MESSAGE);
 
-  return $prefix.$body;
-  }
+  return $body;
+}
+  
+  
+function rcmail_write_compose_attachments(&$message)
+{
+  global $RCMAIL, $IMAP;
 
-function rcmail_create_draft_body($body)
-  {
-  global $IMAP, $DRAFT_MESSAGE;
-    
-  // add attachments
-  if (!isset($_SESSION['compose']['forward_attachments']) && is_array($DRAFT_MESSAGE['parts']) && sizeof($DRAFT_MESSAGE['parts'])>1)
-    { 
-    $temp_dir = rcmail_create_compose_tempdir();
+  $temp_dir = unslashify($RCMAIL->config->get('temp_dir'));
 
-    if (!is_array($_SESSION['compose']['attachments']))
-      $_SESSION['compose']['attachments'] = array();
+  if (!is_array($_SESSION['compose']['attachments']))
+    $_SESSION['compose']['attachments'] = array();
   
-    foreach ($DRAFT_MESSAGE['parts'] as $part)
+  foreach ((array)$message->mime_parts as $pid => $part)
+  {
+    if ($part->ctype_primary != 'message' &&
+        ($part->disposition=='attachment' || $part->disposition=='inline' || $part->headers['content-id'] ||
+         (empty($part->disposition) && $part->filename)))
+    {
+      $tmp_path = tempnam($temp_dir, 'rcmAttmnt');
+      if ($fp = fopen($tmp_path, 'w'))
       {
-      if ($part->disposition=='attachment' || $part->disposition=='inline' || $part->headers['content-id'] ||
-               (empty($part->disposition) && ($part->d_parameters['filename'] || $part->ctype_parameters['name'])))
-        {
-        $tmp_path = tempnam($temp_dir, 'rcmAttmnt');
-        if ($fp = fopen($tmp_path, 'w'))
-          {                     
-          fwrite($fp, $IMAP->mime_decode($part->body, $part->headers['content-transfer-encoding']));
-          fclose($fp);          
-                                
-          if ($part->d_parameters['filename'])
-            $_SESSION['compose']['attachments'][] = array('name' => $part->d_parameters['filename'],
-                                                          'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
-                                                          'path' => $tmp_path);
-
-          else if ($part->ctype_parameters['name'])
-            $_SESSION['compose']['attachments'][] = array('name' => $part->ctype_parameters['name'],
-                                                          'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
-                                                          'path' => $tmp_path);
-
-          else if ($part->headers['content-description'])
-            $_SESSION['compose']['attachments'][] = array('name' => $part->headers['content-description'],
-                                                          'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
-                                                          'path' => $tmp_path);
-          }
-        }
+        fwrite($fp, $message->get_part_content($pid));
+        fclose($fp);
+        
+        $_SESSION['compose']['attachments'][] = array(
+          'mimetype' => $part->ctype_primary . '/' . $part->ctype_secondary,
+          'name' => $part->filename,
+          'path' => $tmp_path
+          );
       }
-
-    $_SESSION['compose']['forward_attachments'] = TRUE;
     }
-
-  return $body;
   }
+       
+  $_SESSION['compose']['forward_attachments'] = true;
+}
 
 
 function rcmail_compose_subject($attrib)
-  {
-  global $CONFIG, $REPLY_MESSAGE, $FORWARD_MESSAGE, $DRAFT_MESSAGE;
+{
+  global $MESSAGE, $compose_mode;
   
   list($form_start, $form_end) = get_form_tags($attrib);
   unset($attrib['form']);
   
   $attrib['name'] = '_subject';
-  $textfield = new textfield($attrib);
+  $textfield = new html_inputfield($attrib);
 
   $subject = '';
 
@@ -576,124 +596,112 @@ function rcmail_compose_subject($attrib)
     $subject = get_input_value('_subject', RCUBE_INPUT_POST, TRUE);
     
   // create a reply-subject
-  else if (isset($REPLY_MESSAGE['subject']))
-    {
-    if (eregi('^re:', $REPLY_MESSAGE['subject']))
-      $subject = $REPLY_MESSAGE['subject'];
+  else if ($compose_mode == RCUBE_COMPOSE_REPLY)
+  {
+    if (eregi('^re:', $MESSAGE->subject))
+      $subject = $MESSAGE->subject;
     else
-      $subject = 'Re: '.$REPLY_MESSAGE['subject'];
-    }
+      $subject = 'Re: '.$MESSAGE->subject;
+  }
 
   // create a forward-subject
-  else if (isset($FORWARD_MESSAGE['subject']))
-    {
-    if (eregi('^fwd:', $REPLY_MESSAGE['subject']))
-      $subject = $FORWARD_MESSAGE['subject'];
+  else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
+  {
+    if (eregi('^fwd:', $MESSAGE->subject))
+      $subject = $MESSAGE->subject;
     else
-      $subject = 'Fwd: '.$FORWARD_MESSAGE['subject'];
-    }
+      $subject = 'Fwd: '.$MESSAGE->subject;
+  }
 
   // creeate a draft-subject
-  else if (isset($DRAFT_MESSAGE['subject']))
-    $subject = $DRAFT_MESSAGE['subject'];
+  else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
+    $subject = $MESSAGE->subject;
   
   $out = $form_start ? "$form_start\n" : '';
   $out .= $textfield->show($subject);
   $out .= $form_end ? "\n$form_end" : '';
          
   return $out;
-  }
+}
 
 
 function rcmail_compose_attachment_list($attrib)
-  {
-  global $OUTPUT, $JS_OBJECT_NAME;
+{
+  global $OUTPUT, $CONFIG;
   
   // add ID if not given
   if (!$attrib['id'])
     $attrib['id'] = 'rcmAttachmentList';
   
-  // allow the following attributes to be added to the <ul> tag
-  $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style'));
-  $out = '<ul'. $attrib_str . ">\n";
+  $out = "\n";
   
   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 = html::img(array(
+        'src' => $CONFIG['skin_path'] . $attrib['deleteicon'],
+        'alt' => rcube_label('delete'),
+        'style' => "border:0;padding-right:2px;vertical-align:middle"));
     else
-      $button = rcube_label('delete');
+      $button = Q(rcube_label('delete'));
 
     foreach ($_SESSION['compose']['attachments'] as $id => $a_prop)
-      $out .= sprintf('<li id="rcmfile%d"><a href="#delete" onclick="return %s.command(\'remove-attachment\',\'rcmfile%d\', this)" title="%s">%s</a>%s</li>',
-                      $id,
-                      $JS_OBJECT_NAME,
-                      $id,
-                      rcube_label('delete'), 
-                      $button,
-                      rep_specialchars_output($a_prop['name']));
-    }
-
-  $OUTPUT->add_script(sprintf("%s.gui_object('attachmentlist', '%s');", $JS_OBJECT_NAME, $attrib['id']));  
-    
-  $out .= '</ul>';
-  return $out;
+      $out .= html::tag('li', array('id' => "rcmfile".$id),
+        html::a(array(
+            'href' => "#delete",
+            'title' => rcube_label('delete'),
+              'onclick' => sprintf("return %s.command(\'remove-attachment\',\'rcmfile%d\', this)", JS_OBJECT_NAME, $id)),
+          $button) . Q($a_prop['name']));
   }
 
+  $OUTPUT->add_gui_object('attachmentlist', $attrib['id']);
+    
+  return html::tag('ul', $attrib, $out, html::$common_attrib);
+}
 
 
 function rcmail_compose_attachment_form($attrib)
-  {
-  global $OUTPUT, $JS_OBJECT_NAME, $SESS_HIDDEN_FIELD;
+{
+  global $OUTPUT;
 
   // add ID if not given
   if (!$attrib['id'])
     $attrib['id'] = 'rcmUploadbox';
   
-  // allow the following attributes to be added to the <div> tag
-  $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style'));
-  $input_field = rcmail_compose_attachment_field(array());
-  $label_send = rcube_label('upload');
-  $label_close = rcube_label('close');
+  $button = new html_inputfield(array('type' => 'button', 'class' => 'button'));
+  
+  $out = html::div($attrib,
+    $OUTPUT->form_tag(array('name' => 'form', 'method' => 'post', 'enctype' => 'multipart/form-data')) .
+    rcmail_compose_attachment_field(array()) . html::br() .
+    $button->show(rcube_label('close'), array('onclick' => "document.getElementById('$attrib[id]').style.visibility='hidden'")) .
+    $button->show(rcube_label('upload'), array('onclick' => JS_OBJECT_NAME . ".command('send-attachment', this.form)"))
+  );
   
-  $out = <<<EOF
-<div$attrib_str>
-<form action="./" method="post" enctype="multipart/form-data">
-$SESS_HIDDEN_FIELD
-$input_field<br />
-<input type="button" value="$label_close" class="button" onclick="document.getElementById('$attrib[id]').style.visibility='hidden'" />
-<input type="button" value="$label_send" class="button" onclick="$JS_OBJECT_NAME.command('send-attachment', this.form)" />
-</form>
-</div>
-EOF;
-
   
-  $OUTPUT->add_script(sprintf("%s.gui_object('uploadbox', '%s');", $JS_OBJECT_NAME, $attrib['id']));  
+  $OUTPUT->add_gui_object('uploadbox', $attrib['id']);
   return $out;
-  }
+}
 
 
 function rcmail_compose_attachment_field($attrib)
-  {
+{
   // allow the following attributes to be added to the <input> tag
   $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'size'));
  
   $out = '<input type="file" name="_attachments[]"'. $attrib_str . " />";
   return $out;
-  }
+}
 
 
 function rcmail_priority_selector($attrib)
-  {
+{
+  global $MESSAGE;
+  
   list($form_start, $form_end) = get_form_tags($attrib);
   unset($attrib['form']);
   
   $attrib['name'] = '_priority';
-  $selector = new select($attrib);
+  $selector = new html_select($attrib);
 
   $selector->add(array(rcube_label('lowest'),
                        rcube_label('low'),
@@ -702,18 +710,20 @@ function rcmail_priority_selector($attrib)
                        rcube_label('highest')),
                  array(5, 4, 0, 2, 1));
                  
-  $sel = isset($_POST['_priority']) ? $_POST['_priority'] : 0;
+  $sel = isset($_POST['_priority']) ? $_POST['_priority'] : intval($MESSAGE->headers->priority);
 
   $out = $form_start ? "$form_start\n" : '';
   $out .= $selector->show($sel);
   $out .= $form_end ? "\n$form_end" : '';
          
   return $out;
-  }
+}
 
 
 function rcmail_receipt_checkbox($attrib)
-  {
+{
+  global $MESSAGE, $compose_mode;
+  
   list($form_start, $form_end) = get_form_tags($attrib);
   unset($attrib['form']);
   
@@ -722,77 +732,133 @@ function rcmail_receipt_checkbox($attrib)
 
   $attrib['name'] = '_receipt';
   $attrib['value'] = '1';
-  $checkbox = new checkbox($attrib);
+  $checkbox = new html_checkbox($attrib);
 
   $out = $form_start ? "$form_start\n" : '';
-  $out .= $checkbox->show(0);
+  $out .= $checkbox->show(
+    $compose_mode == RCUBE_COMPOSE_DRAFT && $MESSAGE->headers->mdn_to ? 1 : 0);
   $out .= $form_end ? "\n$form_end" : '';
 
   return $out;
+}
+
+
+function rcmail_editor_selector($attrib)
+{
+  global $CONFIG, $MESSAGE, $compose_mode;
+
+  $choices = array(
+    'html'  => 'htmltoggle',
+    'plain' => 'plaintoggle'
+  );
+
+  // determine whether HTML or plain text should be checked
+  $useHtml = $CONFIG['htmleditor'] ? true : false;
+
+  if ($compose_mode)
+    $useHtml = ($useHtml && $MESSAGE->has_html_part());
+
+  $selector = '';
+  $chosenvalue = $useHtml ? 'html' : 'plain';
+  $radio = new html_radiobutton(array('name' => '_editorSelect', 'onclick' => 'return rcmail_toggle_editor(this)'));
+  foreach ($choices as $value => $text)
+  {
+    $attrib['id'] = '_' . $value;
+    $attrib['value'] = $value;
+    $selector .= $radio->show($chosenvalue, $attrib) . html::label($attrib['id'], Q(rcube_label($text)));
   }
 
+  return $selector;
+}
+
 
 function get_form_tags($attrib)
-  {
-  global $CONFIG, $OUTPUT, $JS_OBJECT_NAME, $MESSAGE_FORM, $SESS_HIDDEN_FIELD;  
+{
+  global $RCMAIL, $MESSAGE_FORM;
 
   $form_start = '';
   if (!strlen($MESSAGE_FORM))
-    {
-    $hiddenfields = new hiddenfield(array('name' => '_task', 'value' => $GLOBALS['_task']));
+  {
+    $hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $RCMAIL->task));
     $hiddenfields->add(array('name' => '_action', 'value' => 'send'));
 
-    $form_start = empty($attrib['form']) ? '<form name="form" action="./" method="post">' : '';
-    $form_start .= "\n$SESS_HIDDEN_FIELD\n";
+    $form_start = empty($attrib['form']) ? $RCMAIL->output->form_tag(array('name' => "form", 'method' => "post")) : '';
     $form_start .= $hiddenfields->show();
-    }
+  }
     
   $form_end = (strlen($MESSAGE_FORM) && !strlen($attrib['form'])) ? '</form>' : '';
   $form_name = !empty($attrib['form']) ? $attrib['form'] : 'form';
   
   if (!strlen($MESSAGE_FORM))
-    $OUTPUT->add_script("$JS_OBJECT_NAME.gui_object('messageform', '$form_name');");
+    $RCMAIL->output->add_gui_object('messageform', $form_name);
   
   $MESSAGE_FORM = $form_name;
 
-  return array($form_start, $form_end);  
-  }
-
-
-function format_email_recipient($email, $name='')
-  {
-  if ($name && $name != $email)
-    return sprintf('%s <%s>', strpos($name, ",") ? '"'.$name.'"' : $name, $email);
-  else
-    return $email;
-  }
-
+  return array($form_start, $form_end);
+}
 
-function rcmail_charset_pulldown($selected='ISO-8859-1')
-  {
-  $select = new select();
-  
-  
-  return $select->show($selected);
-  }
 
+// register UI objects
+$OUTPUT->add_handlers(array(
+  'composeheaders' => 'rcmail_compose_headers',
+  'composesubject' => 'rcmail_compose_subject',
+  'composebody' => 'rcmail_compose_body',
+  'composeattachmentlist' => 'rcmail_compose_attachment_list',
+  'composeattachmentform' => 'rcmail_compose_attachment_form',
+  'composeattachment' => 'rcmail_compose_attachment_field',
+  'priorityselector' => 'rcmail_priority_selector',
+  'editorselector' => 'rcmail_editor_selector',
+  'receiptcheckbox' => 'rcmail_receipt_checkbox',
+));
 
 /****** get contacts for this user and add them to client scripts ********/
 
-$sql_result = $DB->query("SELECT name, email
-                          FROM ".get_table_name('contacts')." WHERE  user_id=?
-                          AND  del<>1",$_SESSION['user_id']);
+$CONTACTS = new rcube_contacts($DB, $USER->ID);
+$CONTACTS->set_pagesize(1000);
+
+$a_contacts = array(); 
                                    
-if ($DB->num_rows($sql_result))
-  {        
-  $a_contacts = array();
-  while ($sql_arr = $DB->fetch_assoc($sql_result))
+if ($result = $CONTACTS->list_records())
+  {
+  while ($sql_arr = $result->iterate())
     if ($sql_arr['email'])
-      $a_contacts[] = format_email_recipient($sql_arr['email'], rep_specialchars_output($sql_arr['name'], 'js'));
+      $a_contacts[] = format_email_recipient($sql_arr['email'], $sql_arr['name']);
+  }
+if (isset($CONFIG['ldap_public']))
+  {
+  /* LDAP autocompletion */ 
+  foreach ($CONFIG['ldap_public'] as $ldapserv_config) 
+    { 
+    if ($ldapserv_config['fuzzy_search'] != 1 || 
+        $ldapserv_config['global_search'] != 1)
+      { 
+      continue; 
+      }
+        
+    $LDAP = new rcube_ldap($ldapserv_config); 
+    $LDAP->connect(); 
+    $LDAP->set_pagesize(1000);
   
-  $OUTPUT->add_script(sprintf("$JS_OBJECT_NAME.set_env('contacts', %s);", array2js($a_contacts)));
+    $results = $LDAP->search($ldapserv_config['mail_field'], ""); 
+    for ($i = 0; $i < $results->count; $i++) 
+         { 
+         if ($results->records[$i]['email'] != '') 
+           { 
+           $email = $results->records[$i]['email']; 
+           $name = $results->records[$i]['name']; 
+                
+           $a_contacts[] = format_email_recipient($email, $name);
+           } 
+         }
+    $LDAP->close(); 
+    }
+  }
+if ($a_contacts) 
+  { 
+       $OUTPUT->set_env('contacts', $a_contacts); 
   }
 
+$OUTPUT->send('compose');
 
-parse_template('compose');
 ?>