Changeset 2639 in subversion for trunk/roundcubemail/program/steps/mail/compose.inc

Timestamp:

Jun 11, 2009 2:07:35 PM (4 years ago)

Author:

alec

Message:

• Added message Edit feature (#1483891, #1484440) - need icon

File:

• trunk/roundcubemail/program/steps/mail/compose.inc (modified) (7 diffs)

trunk/roundcubemail/program/steps/mail/compose.inc

@@ -24 +24 @@
 define('RCUBE_COMPOSE_FORWARD', 0x0107);
 define('RCUBE_COMPOSE_DRAFT', 0x0108);
+define('RCUBE_COMPOSE_EDIT', 0x0109);
 
 $MESSAGE_FORM = NULL;
@@ -75 +76 @@
 else if ($msg_uid = $_SESSION['compose']['param']['_forward_uid'])
   $compose_mode = RCUBE_COMPOSE_FORWARD;
+else if ($msg_uid = $_SESSION['compose']['param']['_uid'])
+  $compose_mode = RCUBE_COMPOSE_EDIT;
 else if ($msg_uid = $_SESSION['compose']['param']['_draft_uid']) {
   $RCMAIL->imap->set_mailbox($CONFIG['drafts_mbox']);
@@ -169 +172 @@
   else if ($fname && !$fvalue && !empty($_SESSION['compose']['param'][$fname]))
     $fvalue = $_SESSION['compose']['param'][$fname];
-
   else if ($header && $compose_mode == RCUBE_COMPOSE_REPLY)
   {
@@ -209 +211 @@
     }
   }
-  else if ($header && $compose_mode == RCUBE_COMPOSE_DRAFT)
+  else if ($header && in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT)))
   {
     // get drafted headers
@@ -386 +388 @@
       $body = rcmail_create_forward_body($body, $isHtml);
     // load draft message body
-    else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
+    else if ($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT)
       $body = rcmail_create_draft_body($body, $isHtml);
   }
@@ -690 +692 @@
   }
   // creeate a draft-subject
-  else if ($compose_mode == RCUBE_COMPOSE_DRAFT) {
+  else if ($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) {
     $subject = $MESSAGE->subject;
   }
@@ -829 +831 @@
 
   $out = $form_start ? "$form_start\n" : '';
-  $out .= $checkbox->show(
-    $compose_mode == RCUBE_COMPOSE_DRAFT && $MESSAGE->headers->mdn_to ? 1 : 0);
+  $out .= $checkbox->show(in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))
+        && $MESSAGE->headers->mdn_to ? 1 : 0);
   $out .= $form_end ? "\n$form_end" : '';