thomascube
2008-06-20 4dae735feb47918008e289f19d7d5d17462a0682
Flag original message as Forwarded when sending mail

3 files modified
21 ■■■■■ changed files
program/lib/imap.inc 13 ●●●● patch | view | raw | blame | history
program/steps/mail/compose.inc 4 ●●●● patch | view | raw | blame | history
program/steps/mail/sendmail.inc 4 ●●● patch | view | raw | blame | history
program/lib/imap.inc
@@ -147,6 +147,7 @@
    var $deleted = false;
    var $recent = false;
    var $answered = false;
    var $forwarded = false;
    var $junk = false;
}
@@ -1742,11 +1743,6 @@
                    $flags_str = eregi_replace('[\\\"]', '', $flags_str);
                    $flags_a   = explode(' ', $flags_str);
                    /*
                    trigger_error("<!-- ID: $id FLAGS: ".implode(",", $flags_a)." //-->\n",
                        E_USER_WARNING);
                    */
                    if (is_array($flags_a)) {
                        reset($flags_a);
                        while (list($key,$val)=each($flags_a)) {
@@ -1758,7 +1754,9 @@
                                $result[$id]->recent = true;
                            } else if (strcasecmp($val, 'Answered') == 0) {
                                $result[$id]->answered = true;
                            } else if (strcasecmp($val, "\$MDNSent") == 0) {
                            } else if (strcasecmp($val, '$Forwarded') == 0) {
                                $result[$id]->forwarded = true;
                            } else if (strcasecmp($val, '$MDNSent') == 0) {
                                $result[$id]->mdn_sent = true;
                                            }
                        }
@@ -1915,7 +1913,8 @@
        'ANSWERED' => '\\Answered',
        'DRAFT'    => '\\Draft',
        'FLAGGED'  => '\\Flagged',
        'MDNSENT'  => "\$MDNSent");
        'FORWARDED' => '$Forwarded',
        'MDNSENT'  => '$MDNSent');
        
    $flag = strtoupper($flag);
    $flag = $flags[$flag];
program/steps/mail/compose.inc
@@ -105,10 +105,6 @@
  {
    $_SESSION['compose']['forward_uid'] = $msg_uid;
  }
  else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
  {
    $_SESSION['compose']['draft_uid'] = $msg_uid;
  }
}
/****** compose mode functions ********/
program/steps/mail/sendmail.inc
@@ -348,9 +348,11 @@
    return;
    }
  
  // set repliead flag
  // set replied/forwarded flag
  if ($_SESSION['compose']['reply_uid'])
    $IMAP->set_flag($_SESSION['compose']['reply_uid'], 'ANSWERED');
  else if ($_SESSION['compose']['forward_uid'])
    $IMAP->set_flag($_SESSION['compose']['forward_uid'], 'FORWARDED');
  } // End of SMTP Delivery Block