Changeset 0207c45 in github for program/steps/mail/compose.inc

Timestamp:

Nov 2, 2009 4:58:14 AM (4 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

f8a216eb

Parents:

31ddb5e

Message:

More options for top posting feature (#1484272) using patch from Phil Weir

File:

• program/steps/mail/compose.inc (modified) (6 diffs)

program/steps/mail/compose.inc

@@ -104 +104 @@
 // set current mailbox in client environment
 $OUTPUT->set_env('mailbox', $IMAP->get_mailbox_name());
+$OUTPUT->set_env('sig_above', $CONFIG['sig_above']);
 $OUTPUT->set_env('top_posting', $CONFIG['top_posting']);
 
@@ -118 +119 @@
 }
 
-if (!$CONFIG['show_sig'])
+$config_show_sig = $RCMAIL->config->get('show_sig', 1);
+if ($config_show_sig == 1)
   $OUTPUT->set_env('show_sig', true);
-else if ($CONFIG['show_sig'] == 2 && empty($compose_mode))
+else if ($config_show_sig == 2 && (empty($compose_mode) || $compose_mode == RCUBE_COMPOSE_EDIT || $compose_mode == RCUBE_COMPOSE_DRAFT))
   $OUTPUT->set_env('show_sig', true);
-else if ($CONFIG['show_sig'] == 3 && ($compose_mode == RCUBE_COMPOSE_REPLY || $compose_mode == RCUBE_COMPOSE_FORWARD))
+else if ($config_show_sig == 3 && ($compose_mode == RCUBE_COMPOSE_REPLY || $compose_mode == RCUBE_COMPOSE_FORWARD))
   $OUTPUT->set_env('show_sig', true);
+else
+  $OUTPUT->set_env('show_sig', false);
 
 if (!empty($msg_uid))
@@ -519 +523 @@
 function rcmail_create_reply_body($body, $bodyIsHtml)
 {
-  global $MESSAGE;
-  
-  $rcmail = rcmail::get_instance();
-
-  if (! $bodyIsHtml)
-  {
+  global $RCMAIL, $MESSAGE;
+
+  if (!$bodyIsHtml) {
     // try to remove the signature
-    if (!$rcmail->config->get('top_posting') && ($sp = strrpos($body, '-- ')) !== false && ($sp == 0 || $body{$sp-1} == "\n"))
-      {
+    if ($RCMAIL->config->get('strip_existing_sig', true) && ($sp = strrpos($body, '-- ')) !== false && ($sp == 0 || $body{$sp-1} == "\n")) {
       if ($body{$sp+3}==' ' || $body{$sp+3}=="\n" || $body{$sp+3}=="\r")
         $body = substr($body, 0, max(0, $sp-1));
-      }
+    }
 
     // soft-wrap message first
@@ -542 +542 @@
 
       // add > to each line
-      for($n=0; $n<sizeof($a_lines); $n++) {
+      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];
-        }
+      }
  
       $body = join("\n", $a_lines);
-      }
+    }
 
     // add title line(s)
@@ -558 +558 @@
 
     $suffix = '';
-
-    if ($rcmail->config->get('top_posting'))
+    
+    if ($RCMAIL->config->get('top_posting'))
       $prefix = "\n\n\n" . $prefix;
   }
-  else
-  {
+  else {
     // save inline images to files
     $cid_map = rcmail_write_inline_attachments($MESSAGE);
@@ -574 +573 @@
     $prefix = sprintf("On %s, %s wrote:<br />\n",
       $MESSAGE->headers->date,
-      htmlspecialchars(Q($MESSAGE->get_header('from'), 'replace'), ENT_COMPAT, $rcmail->output->get_charset()));
+      htmlspecialchars(Q($MESSAGE->get_header('from'), 'replace'), ENT_COMPAT, $RCMAIL->output->get_charset()));
     $prefix .= '<blockquote type="cite" style="padding-left:5px; border-left:#1010ff 2px solid; margin-left:5px; width:100%">';
-
-    if ($rcmail->config->get('top_posting')) {
-          $prefix = "<p></p>" . $prefix;
-          $suffix = "</blockquote>";
+    
+    if ($RCMAIL->config->get('top_posting')) {
+      $prefix = "<p></p>" . $prefix;
+      $suffix = "</blockquote>";
     }
     else {