X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fread_body.php;h=421a44896c7ac8dc0f9bd70207d10f3472fa1fdf;hp=1b12317106958f3243b513a5c28334c3454ec4f9;hb=020abcf38274494558650035430a4be32e01d6e6;hpb=f2ac56aff94eaf0e985e6fcfe182a38f96bec4e5

diff --git a/src/read_body.php b/src/read_body.php
index 1b123171..421a4489 100644
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -299,6 +299,52 @@
          }
       }
    }
+   /** FORMAT THE BCC STRING **/
+   $i = 0;
+   if (isset ($message->header->bcc[0]) && trim($message->header->bcc[0])){
+      $bcc_string = "";
+      $bcc_ary = $message->header->bcc;
+      while ($i < count(decodeHeader($bcc_ary))) {
+         $bcc_ary[$i] = htmlspecialchars($bcc_ary[$i]);
+         if ($bcc_string)
+            $bcc_string = "$bcc_string<BR>$bcc_ary[$i]";
+         else
+            $bcc_string = "$bcc_ary[$i]";
+   
+         $i++;
+         if (count($bcc_ary) > 1) {
+            if ($show_more_cc == false) {
+               if ($i == 1) {
+                  if (isset($where) && isset($what)) {
+                     // from a search
+                     $bcc_string = "$bcc_string&nbsp;(<A HREF=\"read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&what=".urlencode($what)."&where=".urlencode($where)."&show_more_cc=1&show_more=$show_more\">$echo_more</A>)";
+                  } else {
+                     $bcc_string = "$bcc_string&nbsp;(<A HREF=\"read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&sort=$sort&startMessage=$startMessage&show_more_cc=1&show_more=$show_more\">$echo_more</A>)";
+                  }   
+                  $i = count($bcc_ary);
+               }
+            } else if ($i == 1) {
+               if (isset($where) && isset($what)) {
+                  // from a search
+                  $bcc_string = "$bcc_string&nbsp;(<A HREF=\"read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&what=".urlencode($what)."&where=".urlencode($where)."&show_more_cc=0&show_more=$show_more\">$echo_less</A>)";
+               } else {
+                  $bcc_string = "$bcc_string&nbsp;(<A HREF=\"read_body.php?mailbox=$urlMailbox&passed_id=$passed_id&sort=$sort&startMessage=$startMessage&show_more_cc=0&show_more=$show_more\">$echo_less</A>)";
+               }   
+            }
+         }
+      }
+   }
+
+   if($default_use_priority) {
+       switch(substr($message->header->priority,0,1)) {
+	 case "1" : $priority_string = _("High");
+	 break;
+	 case "3" : $priority_string = _("Normal");
+	 break;
+	 case "5" : $priority_string = _("Low");
+	 break;
+       }
+   }
    /** make sure everything will display in HTML format **/
    $from_name = decodeHeader(htmlspecialchars($message->header->from));
    $subject = decodeHeader(htmlspecialchars($message->header->subject));
@@ -306,11 +352,11 @@
    do_hook('read_body_top');
    echo '<BR>' .
         '<TABLE CELLSPACING="0" WIDTH="100%" BORDER="0" ALIGN="CENTER" CELLPADDING="0">' . "\n" .
-        '   <TR><TD BGCOLOR="' . $color[9] . '" WIDTH="100%">' .
-        '      <TABLE WIDTH="100%" CELLSPACING="0" BORDER="0" CELLPADDING="3">' .
-        '         <TR>' .
-        '            <TD ALIGN="LEFT" WIDTH="33%">' .
-        '               <SMALL>';
+        '   <TR><TD BGCOLOR="' . $color[9] . '" WIDTH="100%">' . "\n" .
+        '      <TABLE WIDTH="100%" CELLSPACING="0" BORDER="0" CELLPADDING="3">' . "\n" .
+        '         <TR>' . "\n" .
+        '            <TD ALIGN="LEFT" WIDTH="33%">' . "\n" .
+        '               <SMALL>' . "\n";
    if ($where && $what) {
       echo "               <A HREF=\"search.php?where=".urlencode($where)."&what=".urlencode($what)."&mailbox=$urlMailbox\">";
    } else {
@@ -323,11 +369,17 @@
    } else {
       echo "               <A HREF=\"delete_message.php?mailbox=$urlMailbox&message=$passed_id&sort=$sort&startMessage=$startMessage\">";
    }
-   echo _("Delete") .
-        '</A>&nbsp;&nbsp;' .
+   echo _("Delete") . '</A>&nbsp;';
+   if (($mailbox == $draft_folder) && ($save_as_draft)) {
+      echo '|&nbsp;';
+      echo "               <A HREF=\"compose.php?mailbox=$mailbox&send_to=$to_string&send_to_cc=$cc_string&send_to_bcc=$bcc_string&subject=$url_subj&draft_id=$passed_id&ent_num=$ent_num\">";
+      echo _("Resume Draft") . '</a>';
+   }
+   echo '&nbsp;&nbsp;' .
         '               </SMALL>' .
         '            </TD><TD WIDTH="33%" ALIGN="CENTER">' .
         '               <SMALL>' . "\n";
+
    if ($where && $what) {
    } else {
       if ($currentArrayIndex == -1) {
@@ -415,6 +467,27 @@
            '         </TD>' . "\n" .
            '      </TR>' . "\n";
    }
+   /** bcc **/
+   if (isset($bcc_string)) {
+      echo "      <TR>\n" .
+           "         <TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>\n" .
+           '            Bcc:' . "\n" .
+           "         </TD><TD BGCOLOR=\"$color[0]\" VALIGN=TOP colspan=2>\n" .
+           "            <B>$bcc_string</B>&nbsp;\n" .
+           '         </TD>' . "\n" .
+           '      </TR>' . "\n";
+   }
+   if ($default_use_priority) {
+      if (isset($priority_string)) {
+	echo "      <TR>\n" .
+	  "         <TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>\n" .
+	  "            "._("Priority").": \n".
+	  "         </TD><TD BGCOLOR=\"$color[0]\" VALIGN=TOP colspan=2>\n" .
+	  "            <B>$priority_string</B>&nbsp;\n" .
+	  "         </TD>" . "\n" .
+	  "      </TR>" . "\n";
+      }
+   }
    do_hook("read_body_header");
    echo '</TABLE>' .
         '   </TD></TR>' .
@@ -435,4 +508,4 @@
    do_hook('read_body_bottom');
    do_hook('html_bottom');
    sqimap_logout($imapConnection);
-?>
\ No newline at end of file
+?>