style police step 1

src/compose.php

@@ -41,67 +41,71 @@ require_once('../functions/smtp.php');
 require_once('../functions/display_messages.php');
 require_once('../functions/plugin.php');
 
-   if (!isset($attachments)) {
-       $attachments = array();
-       session_register('attachments');
-   }
-
-   // This function is used when not sending or adding attachments
-   function newMail () {
-      global $forward_id, $imapConnection, $msg, $ent_num, $body_ary, $body,
-             $reply_id, $send_to, $send_to_cc, $mailbox, $send_to_bcc, $editor_size,
-             $draft_id, $use_signature;
-
-      $send_to = decodeHeader($send_to);
-      $send_to_cc = decodeHeader($send_to_cc);
-      $send_to_bcc = decodeHeader($send_to_bcc);
-
-      if ($forward_id)
-         $id = $forward_id;
-      elseif ($reply_id)
-         $id = $reply_id;
+if (!isset($attachments)) {
+    $attachments = array();
+    session_register('attachments');
+}
+
+/* This function is used when not sending or adding attachments */
+function newMail () {
+    global $forward_id, $imapConnection, $msg, $ent_num, $body_ary, $body,
+           $reply_id, $send_to, $send_to_cc, $mailbox, $send_to_bcc, $editor_size,
+           $draft_id, $use_signature;
+
+    $send_to = decodeHeader($send_to);
+    $send_to_cc = decodeHeader($send_to_cc);
+    $send_to_bcc = decodeHeader($send_to_bcc);
+
+    if ($forward_id) {
+        $id = $forward_id;
+    } elseif ($reply_id) {
+        $id = $reply_id;
+    }
 
-      if ($draft_id){
-         $id = $draft_id;
-         $use_signature = FALSE;
-      }
+    if ($draft_id){
+        $id = $draft_id;
+        $use_signature = FALSE;
+    }
 
-      if (isset($id)) {
-         sqimap_mailbox_select($imapConnection, $mailbox);
-         $message = sqimap_get_message($imapConnection, $id, $mailbox);
-         $orig_header = $message->header;
-         if ($ent_num)
+    if (isset($id)) {
+        sqimap_mailbox_select($imapConnection, $mailbox);
+        $message = sqimap_get_message($imapConnection, $id, $mailbox);
+        $orig_header = $message->header;
+        if ($ent_num) {
             $message = getEntity($message, $ent_num);
-
-         if ($message->header->type0 == 'text' || $message->header->type1 == 'message') {
-            if ($ent_num)
-               $body = decodeBody(mime_fetch_body($imapConnection, $id, $ent_num), $message->header->encoding);
-            else
-               $body = decodeBody(mime_fetch_body($imapConnection, $id, 1), $message->header->encoding);
-         } else {
+        }
+        if ($message->header->type0 == 'text' ||
+            $message->header->type1 == 'message') {
+            if ($ent_num) {
+                $body = decodeBody(
+                    mime_fetch_body($imapConnection, $id, $ent_num),
+                    $message->header->encoding);
+            } else {
+                $body = decodeBody(
+                    mime_fetch_body($imapConnection, $id, 1),
+                    $message->header->encoding);
+            }
+        } else {
             $body = "";
-         }
+        }
 
-         if ($message->header->type1 == "html")
+        if ($message->header->type1 == "html") {
             $body = strip_tags($body);
+        }
 
-         sqUnWordWrap($body);
-         $body_ary = explode("\n", $body);
-         $i = count($body_ary) - 1;
-         while ($i >= 0 && ereg("^[>\\s]*$", $body_ary[$i])) {
+        sqUnWordWrap($body);
+        $body_ary = explode("\n", $body);
+        $i = count($body_ary) - 1;
+        while ($i >= 0 && ereg("^[>\\s]*$", $body_ary[$i])) {
             unset($body_ary[$i]);
             $i --;
-         }
-         $body = "";
-         for ($i=0; isset($body_ary[$i]); $i++) {
-            if ($reply_id)
-            {
-                if (ereg('^[ >]+', $body_ary[$i]))
-                {
+        }
+        $body = '';
+        for ($i=0; isset($body_ary[$i]); $i++) {
+            if ($reply_id) {
+                if (ereg('^[ >]+', $body_ary[$i])) {
                     $body_ary[$i] = '>' . $body_ary[$i];
-                }
-                else
-                {
+                } else {
                     $body_ary[$i] = '> ' . $body_ary[$i];
                 }
             }
@@ -110,16 +114,15 @@ require_once('../functions/plugin.php');
             }
             $body .= $body_ary[$i] . "\n";
             unset($body_ary[$i]);
-         }
-         if ($forward_id)
-         {
-             $bodyTop =  "-------- " . _("Original Message") . " --------\n";
-             $bodyTop .= _("Subject") . ": " . $orig_header->subject . "\n";
-             $bodyTop .= _("From") . ": " . $orig_header->from . "\n";
-             $bodyTop .= _("To") . ": " . $orig_header->to[0] . "\n";
+        }
+        if ($forward_id) {
+            $bodyTop =  '-------- ' . _("Original Message") . " --------\n" .
+                        _("Subject") . ': ' . $orig_header->subject . "\n" .
+                        _("From")    . ': ' . $orig_header->from    . "\n" .
+                        _("To")      . ': ' . $orig_header->to[0]   . "\n";
              if (count($orig_header->to) > 1) {
                  for ($x=1; $x < count($orig_header->to); $x++) {
-                     $bodyTop .= "         " . $orig_header->to[$x] . "\n";
+                     $bodyTop .= '         ' . $orig_header->to[$x] . "\n";
                  }
              }
              $bodyTop .= "\n";
@@ -130,268 +133,285 @@ require_once('../functions/plugin.php');
          }
 
          return;
-      }
+    }
 
-      if (!$send_to) {
+    if (!$send_to) {
          $send_to = sqimap_find_email($send_to);
-      }
+    }
 
-      /** This formats a CC string if they hit "reply all" **/
-      if ($send_to_cc != "") {
-         $send_to_cc = ereg_replace( '"[^"]*"', "", $send_to_cc);
-         $send_to_cc = ereg_replace(";", ",", $send_to_cc);
-         $sendcc = explode(",", $send_to_cc);
-         $send_to_cc = "";
+    /* This formats a CC string if they hit "reply all" */
+    if ($send_to_cc != '') {
+        $send_to_cc = ereg_replace('"[^"]*"', '', $send_to_cc);
+        $send_to_cc = ereg_replace(';', ',', $send_to_cc);
+        $sendcc = explode(',', $send_to_cc);
+        $send_to_cc = '';
 
-         for ($i = 0; $i < count($sendcc); $i++) {
+        for ($i = 0; $i < count($sendcc); $i++) {
             $sendcc[$i] = trim($sendcc[$i]);
-            if ($sendcc[$i] == "")
-               continue;
+            if ($sendcc[$i] == '') {
+                continue;
+            }
 
             $sendcc[$i] = sqimap_find_email($sendcc[$i]);
-            $whofrom = sqimap_find_displayable_name($msg["HEADER"]["FROM"]);
-            $whoreplyto = sqimap_find_email($msg["HEADER"]["REPLYTO"]);
+            $whofrom = sqimap_find_displayable_name($msg['HEADER']['FROM']);
+            $whoreplyto = sqimap_find_email($msg['HEADER']['REPLYTO']);
 
             if ((strtolower(trim($sendcc[$i])) != strtolower(trim($whofrom))) &&
                 (strtolower(trim($sendcc[$i])) != strtolower(trim($whoreplyto))) &&
-                (trim($sendcc[$i]) != "")) {
-               $send_to_cc .= trim($sendcc[$i]) . ", ";
+                (trim($sendcc[$i]) != '')) {
+                $send_to_cc .= trim($sendcc[$i]) . ', ';
             }
-         }
-         $send_to_cc = trim($send_to_cc);
-         if (substr($send_to_cc, -1) == ",") {
+        }
+        $send_to_cc = trim($send_to_cc);
+        if (substr($send_to_cc, -1) == ',') {
             $send_to_cc = substr($send_to_cc, 0, strlen($send_to_cc) - 1);
-         }
-      }
-   } // function newMail()
+        }
+    }
+} /* function newMail() */
 
-   function getAttachments($message) {
-      global $mailbox, $attachments, $attachment_dir, $imapConnection,
-             $ent_num, $forward_id, $draft_id, $username;
+
+function getAttachments($message) {
+    global $mailbox, $attachments, $attachment_dir, $imapConnection,
+           $ent_num, $forward_id, $draft_id, $username;
  
-     if (isset($draft_id))
+    if (isset($draft_id)) {
          $id = $draft_id;
-      else
+    } else {
          $id = $forward_id;
+    }
 
-      if (!$message) {
-           sqimap_mailbox_select($imapConnection, $mailbox);
-           $message = sqimap_get_message($imapConnection, $id,
-               $mailbox);
-      }
+    if (!$message) {
+        sqimap_mailbox_select($imapConnection, $mailbox);
+        $message = sqimap_get_message($imapConnection, $id, $mailbox);
+    }
 
-      $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
-      if (count($message->entities) == 0) {
-          if ($message->header->entity_id != $ent_num) {
-              $filename = decodeHeader($message->header->filename);
-
-              if ($filename == "")
-                  $filename = "untitled-".$message->header->entity_id;
-
-              $localfilename = GenerateRandomString(32, '', 7);
-              $full_localfilename = "$hashed_attachment_dir/$localfilename";
-              while (file_exists($full_localfilename)) {
-                  $localfilename = GenerateRandomString(32, '', 7);
-                  $full_localfilename = "$hashed_attachment_dir/$localfilename";
-              }
-
-              $newAttachment = array();
-              $newAttachment['localfilename'] = $localfilename;
-              $newAttachment['remotefilename'] = $filename;
-              $newAttachment['type'] = strtolower($message->header->type0 .
-                 '/' . $message->header->type1);
-
-              // Write Attachment to file
-              $fp = fopen ("$hashed_attachment_dir/$localfilename", 'w');
-              fputs ($fp, decodeBody(mime_fetch_body($imapConnection,
-                  $id, $message->header->entity_id),
-                  $message->header->encoding));
-              fclose ($fp);
-
-              $attachments[] = $newAttachment;
-          }
-      } else {
-          for ($i = 0; $i < count($message->entities); $i++) {
-              getAttachments($message->entities[$i]);
-          }
-      }
-      return;
-   }
+    $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+    if (count($message->entities) == 0) {
+        if ($message->header->entity_id != $ent_num) {
+            $filename = decodeHeader($message->header->filename);
 
-   function showInputForm () {
-      global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body,
-         $passed_body, $color, $use_signature, $signature, $prefix_sig,
-         $editor_size, $attachments, $subject, $newmail,
-         $use_javascript_addr_book, $send_to_bcc, $reply_id, $mailbox,
-         $from_htmladdr_search, $location_of_buttons, $attachment_dir,
-         $username, $data_dir, $identity, $draft_id, $delete_draft,
-	 $mailprio;
+            if ($filename == "") {
+                $filename = "untitled-".$message->header->entity_id;
+            }
 
-      $subject = decodeHeader($subject);
-      $reply_subj = decodeHeader($reply_subj);
-      $forward_subj = decodeHeader($forward_subj);
+            $localfilename = GenerateRandomString(32, '', 7);
+            $full_localfilename = "$hashed_attachment_dir/$localfilename";
+            while (file_exists($full_localfilename)) {
+                $localfilename = GenerateRandomString(32, '', 7);
+                $full_localfilename = "$hashed_attachment_dir/$localfilename";
+            }
 
-      if ($use_javascript_addr_book) {
-         echo "\n<SCRIPT LANGUAGE=JavaScript><!--\n";
-         echo "function open_abook() { \n";
-         echo "  var nwin = window.open(\"addrbook_popup.php\",\"abookpopup\",";
-         echo "\"width=670,height=300,resizable=yes,scrollbars=yes\");\n";
-         echo "  if((!nwin.opener) && (document.windows != null))\n";
-         echo "    nwin.opener = document.windows;\n";
-         echo "}\n";
-         echo "// --></SCRIPT>\n\n";
-      }
+            $newAttachment = array();
+            $newAttachment['localfilename'] = $localfilename;
+            $newAttachment['remotefilename'] = $filename;
+            $newAttachment['type'] = strtolower($message->header->type0 .
+                '/' . $message->header->type1);
+
+            /* Write Attachment to file */
+            $fp = fopen ("$hashed_attachment_dir/$localfilename", 'w');
+            fputs($fp, decodeBody(mime_fetch_body($imapConnection,
+                $id, $message->header->entity_id),
+                $message->header->encoding));
+            fclose ($fp);
+
+            $attachments[] = $newAttachment;
+        }
+    } else {
+        for ($i = 0; $i < count($message->entities); $i++) {
+            getAttachments($message->entities[$i]);
+        }
+    }
+    return;
+}
+
+function showInputForm () {
+    global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body,
+           $passed_body, $color, $use_signature, $signature, $prefix_sig,
+           $editor_size, $attachments, $subject, $newmail,
+           $use_javascript_addr_book, $send_to_bcc, $reply_id, $mailbox,
+           $from_htmladdr_search, $location_of_buttons, $attachment_dir,
+           $username, $data_dir, $identity, $draft_id, $delete_draft,
+	   $mailprio;
+
+    $subject = decodeHeader($subject);
+    $reply_subj = decodeHeader($reply_subj);
+    $forward_subj = decodeHeader($forward_subj);
+
+    if ($use_javascript_addr_book) {
+        echo "\n". '<SCRIPT LANGUAGE=JavaScript><!--' . "\n" .
+             'function open_abook() { ' . "\n" .
+             '  var nwin = window.open("addrbook_popup.php","abookpopup",' .
+             '"width=670,height=300,resizable=yes,scrollbars=yes");' . "\n" .
+             '  if((!nwin.opener) && (document.windows != null))' . "\n" .
+             '    nwin.opener = document.windows;' . "\n" .
+             "}\n" .
+             '// --></SCRIPT>' . "\n\n";
+    }
 
-      echo "\n<FORM name=compose action=\"compose.php\" METHOD=POST ENCTYPE=\"multipart/form-data\"";
-      do_hook("compose_form");
-          echo ">\n";
+    echo "\n" . '<FORM name=compose action="compose.php" METHOD=POST ' .
+         'ENCTYPE="multipart/form-data"';
+    do_hook("compose_form");
+    echo ">\n";
 
-      if (isset($draft_id)) {
-         echo "<input type=\"hidden\" name=\"delete_draft\" value=\"$draft_id\">\n";
-      }
-      if (isset($delete_draft)) {
-         echo "<input type=\"hidden\" name=\"delete_draft\" value=\"$delete_draft\">\n";
-      }
+    if (isset($draft_id)) {
+        echo '<input type="hidden" name="delete_draft" value="' . $draft_id . "\">\n";
+    }
+    if (isset($delete_draft)) {
+        echo '<input type="hidden" name="delete_draft" value="' . $delete_draft. "\">\n";
+    }
 
-      echo "<TABLE WIDTH=\"100%\" ALIGN=center CELLSPACING=0 BORDER=0>\n";
-
-      if ($location_of_buttons == 'top') showComposeButtonRow();
-
-      $idents = getPref($data_dir, $username, 'identities');
-      if ($idents != '' && $idents > 1) {
-         echo "   <TR>\n";
-         echo "      <TD BGCOLOR=\"$color[4]\" WIDTH=\"10%\" ALIGN=RIGHT>\n";
-         echo _("From:");
-         echo "      </TD><TD BGCOLOR=\"$color[4]\" WIDTH=\"90%\">\n";
-         echo "<select name=identity>\n";
-         echo "<option value=default>" .
-         htmlspecialchars(getPref($data_dir, $username, 'full_name'));
-         $em = getPref($data_dir, $username, 'email_address');
-         if ($em != '')
+    echo '<TABLE WIDTH="100%" ALIGN=center CELLSPACING=0 BORDER=0>' . "\n";
+
+    if ($location_of_buttons == 'top') { showComposeButtonRow(); }
+
+    $idents = getPref($data_dir, $username, 'identities');
+    if ($idents != '' && $idents > 1) {
+        echo '   <TR>' . "\n" .
+             '      <TD BGCOLOR="' . $color[4] . '" WIDTH="10%" ALIGN=RIGHT>' .
+             "\n" .
+             _("From:") .
+             '      </TD><TD BGCOLOR="' . $color[4] . '" WIDTH="90%">' . "\n" .
+             '<select name=identity>' . "\n" .
+             '<option value=default>' .
+             htmlspecialchars(getPref($data_dir, $username, 'full_name'));
+        $em = getPref($data_dir, $username, 'email_address');
+        if ($em != '') {
             echo htmlspecialchars(' <' . $em . '>') . "\n";
-         for ($i = 1; $i < $idents; $i ++) {
+        }
+        for ($i = 1; $i < $idents; $i ++) {
             echo '<option value="' . $i . '"';
-            if (isset($identity) && $identity == $i)
+            if (isset($identity) && $identity == $i) {
                echo ' SELECTED';
-            echo '>';
-            echo htmlspecialchars(getPref($data_dir, $username, 'full_name' .
-                                        $i));
+            }
+            echo '>' . htmlspecialchars(getPref($data_dir, $username,
+                                                'full_name' . $i));
             $em = getPref($data_dir, $username, 'email_address' . $i);
-            if ($em != '')
+            if ($em != '') {
                echo htmlspecialchars(' <' . $em . '>') . "\n";
-         }
-         echo "</select>\n";
-         echo "      </TD>\n";
-         echo "   </TR>\n";
-      }
-      echo "   <TR>\n";
-      echo "      <TD BGCOLOR=\"$color[4]\" WIDTH=\"10%\" ALIGN=RIGHT>\n";
-      echo _("To:");
-      echo "      </TD><TD BGCOLOR=\"$color[4]\" WIDTH=\"90%\">\n";
-      printf("         <INPUT TYPE=text NAME=\"send_to\" VALUE=\"%s\" SIZE=60><BR>\n",
-             htmlspecialchars($send_to));
-      echo "      </TD>\n";
-      echo "   </TR>\n";
-      echo "   <TR>\n";
-      echo "      <TD BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
-      echo _("CC:");
-      echo "      </TD><TD BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
-      printf("         <INPUT TYPE=text NAME=\"send_to_cc\" SIZE=60 VALUE=\"%s\"><BR>\n",
-             htmlspecialchars($send_to_cc));
-      echo "      </TD>\n";
-      echo "   </TR>\n";
-      echo "   <TR>\n";
-      echo "      <TD BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
-      echo _("BCC:");
-      echo "      </TD><TD BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
-      printf("         <INPUT TYPE=text NAME=\"send_to_bcc\" VALUE=\"%s\" SIZE=60><BR>\n",
-             htmlspecialchars($send_to_bcc));
-      echo "</TD></TR>\n";
-
-      echo "   <TR>\n";
-      echo "      <TD BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
-      echo _("Subject:");
-      echo "      </TD><TD BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
-      if ($reply_subj) {
-         $reply_subj = str_replace("\"", "'", $reply_subj);
-         $reply_subj = trim($reply_subj);
-         if (substr(strtolower($reply_subj), 0, 3) != "re:")
-            $reply_subj = "Re: $reply_subj";
-         printf("         <INPUT TYPE=text NAME=subject SIZE=60 VALUE=\"%s\">",
-                htmlspecialchars($reply_subj));
-      } else if ($forward_subj) {
-         $forward_subj = trim($forward_subj);
-         if ((substr(strtolower($forward_subj), 0, 4) != 'fwd:') &&
-             (substr(strtolower($forward_subj), 0, 5) != '[fwd:') &&
-             (substr(strtolower($forward_subj), 0, 6) != '[ fwd:'))
-            $forward_subj = "[Fwd: $forward_subj]";
-         printf("         <INPUT TYPE=text NAME=subject SIZE=60 VALUE=\"%s\">",
-                htmlspecialchars($forward_subj));
-      } else {
-          printf("         <INPUT TYPE=text NAME=subject SIZE=60 VALUE=\"%s\">",
-                htmlspecialchars($subject));
-      }
-      echo "</td></tr>\n\n";
-
-      if ($location_of_buttons == 'between') showComposeButtonRow();
-
-      echo "   <TR>\n";
-      echo "      <TD BGCOLOR=\"$color[4]\" COLSPAN=2>\n";
-      echo "         &nbsp;&nbsp;<TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>";
-      echo htmlspecialchars($body);
-      if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {
-        if ( $prefix_sig == true )
-          echo "\n\n-- \n" . htmlspecialchars($signature);
-        else
-          echo "\n\n" . htmlspecialchars($signature);
-      }
-      echo "</TEXTAREA><BR>\n";
-      echo "      </TD>\n";
-      echo "   </TR>\n";
-
-      if ($location_of_buttons == 'bottom')
-         showComposeButtonRow();
-      else {
-         echo "   <TR><TD>&nbsp;</TD><TD ALIGN=LEFT><INPUT TYPE=SUBMIT NAME=send VALUE=\""._("Send")."\"></TD></TR>\n";
-      }
+            }
+        }
+        echo '</select>' . "\n" .
+             '      </TD>' . "\n" .
+             '   </TR>' . "\n";
+    }
+    echo '   <TR>' . "\n" .
+         '      <TD BGCOLOR="' . $color[4] . '" WIDTH="10%" ALIGN=RIGHT>' . "\n" .
+         _("To:") .
+         '      </TD><TD BGCOLOR="' . $color[4] . '" WIDTH="90%">' . "\n" .
+         '         <INPUT TYPE=text NAME="send_to" VALUE="' .
+         htmlspecialchars($send_to) . '" SIZE=60><BR>' . "\n" .
+         '      </TD>' . "\n" .
+         '   </TR>' . "\n" .
+         '   <TR>' . "\n" .
+         '      <TD BGCOLOR="' . $color[4] . '" ALIGN=RIGHT>' . "\n" .
+         _("CC:") .
+         '      </TD><TD BGCOLOR="' . $color[4] . '" ALIGN=LEFT>' . "\n" .
+         '         <INPUT TYPE=text NAME="send_to_cc" SIZE=60 VALUE="' .
+         htmlspecialchars($send_to_cc) . '"><BR>' . "\n" .
+         '      </TD>' . "\n" .
+         '   </TR>' . "\n" .
+         '   <TR>' . "\n" .
+         '      <TD BGCOLOR="' . $color[4] . '" ALIGN=RIGHT>' . "\n" .
+         _("BCC:") .
+         '      </TD><TD BGCOLOR="' . $color[4] . '" ALIGN=LEFT>' . "\n" .
+         '         <INPUT TYPE=text NAME="send_to_bcc" VALUE="' .
+         htmlspecialchars($send_to_bcc) . '" SIZE=60><BR>' . "\n" .
+         '</TD></TR>' . "\n" .
+         '   <TR>' . "\n" .
+         '      <TD BGCOLOR="' . $color[4] . '" ALIGN=RIGHT>' . "\n" .
+         _("Subject:") .
+         '      </TD><TD BGCOLOR="' . $color[4] . '" ALIGN=LEFT>' . "\n";
+    if ($reply_subj) {
+        $reply_subj = str_replace('"', "'", $reply_subj);
+        $reply_subj = trim($reply_subj);
+        if (substr(strtolower($reply_subj), 0, 3) != 're:')
+            $reply_subj = 'Re: ' . $reply_subj;
+        echo '         <INPUT TYPE=text NAME=subject SIZE=60 VALUE="' .
+             htmlspecialchars($reply_subj) . '">';
+    } else if ($forward_subj) {
+        $forward_subj = trim($forward_subj);
+        if ((substr(strtolower($forward_subj), 0, 4) != 'fwd:') &&
+            (substr(strtolower($forward_subj), 0, 5) != '[fwd:') &&
+            (substr(strtolower($forward_subj), 0, 6) != '[ fwd:')) {
+            $forward_subj = '[Fwd: ' . $forward_subj . ']';
+        }
+        echo '         <INPUT TYPE=text NAME=subject SIZE=60 VALUE="' .
+             htmlspecialchars($forward_subj) . '">';
+    } else {
+        echo '         <INPUT TYPE=text NAME=subject SIZE=60 VALUE="' . 
+             htmlspecialchars($subject) . '">';
+    }
+    echo '</td></tr>' . "\n\n";
+
+    if ($location_of_buttons == 'between') { showComposeButtonRow(); }
+
+    echo '   <TR>' . "\n" .
+         '      <TD BGCOLOR="' . $color[4] . '" COLSPAN=2>' . "\n" .
+         '         &nbsp;&nbsp;<TEXTAREA NAME=body ROWS=20 COLS="' .
+         $editor_size . '" WRAP=HARD>' . htmlspecialchars($body);
+    if ($use_signature == true && $newmail == true && !isset($from_htmladdr_search)) {
+        if ( $prefix_sig == true ) {
+            echo "\n\n-- \n" . htmlspecialchars($signature);
+        } else {
+            echo "\n\n" . htmlspecialchars($signature);
+        }
+    }
+    echo '</TEXTAREA><BR>' . "\n" .
+         '      </TD>' . "\n" .
+         '   </TR>' . "\n";
+
+    if ($location_of_buttons == 'bottom') {
+        showComposeButtonRow();
+    } else {
+        echo '   <TR><TD>&nbsp;</TD><TD ALIGN=LEFT><INPUT TYPE=SUBMIT ' .
+             'NAME=send VALUE="' . _("Send") . '"></TD></TR>' . "\n";
+    }
 
-      // This code is for attachments
-      echo "   <TR>\n";
-      echo "     <TD VALIGN=MIDDLE ALIGN=RIGHT>\n";
-      echo        _("Attach:");
-      echo "      </TD>\n";
-      echo "      <TD VALIGN=MIDDLE ALIGN=LEFT>\n";
-      echo "      <INPUT NAME=\"attachfile\" SIZE=48 TYPE=\"file\">\n";
-      echo "      &nbsp;&nbsp;<input type=\"submit\" name=\"attach\"";
-      echo " value=\"" . _("Add") ."\">\n";
-      echo "     </TD>\n";
-      echo "   </TR>\n";
-      if (count($attachments)) {
-         $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
-         echo "<tr><td bgcolor=\"$color[0]\" align=right>\n";
-         echo "&nbsp;";
-         echo "</td><td align=left bgcolor=\"$color[0]\">";
-         foreach ($attachments as $key => $info) {
+    /* This code is for attachments */
+    echo '   <TR>' . "\n" .
+         '     <TD VALIGN=MIDDLE ALIGN=RIGHT>' . "\n" .
+                _("Attach:") .
+         '      </TD>' . "\n" .
+         '      <TD VALIGN=MIDDLE ALIGN=LEFT>' . "\n" .
+         '      <INPUT NAME="attachfile" SIZE=48 TYPE="file">' . "\n" .
+         '      &nbsp;&nbsp;<input type="submit" name="attach"' .
+         ' value="' . _("Add") .'">' . "\n" .
+         '     </TD>' . "\n" .
+         '   </TR>' . "\n";
+    if (count($attachments)) {
+        $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
+        echo '<tr><td bgcolor="' . $color[0] . '" align=right>' . "\n" .
+             '&nbsp;' .
+             '</td><td align=left bgcolor="' . $color[0] . '">';
+        foreach ($attachments as $key => $info) {
             $attached_file = "$hashed_attachment_dir/$info[localfilename]";
-            echo "<input type=\"checkbox\" name=\"delete[]\" value=\"$key\">\n";
-            echo $info['remotefilename'] . " - " . $info['type'] . " (";
-            echo show_readable_size(filesize($attached_file)) . ")<br>\n";
-         }
+            echo '<input type="checkbox" name="delete[]" value="' . $key . "\">\n" .
+                 $info['remotefilename'] . ' - ' . $info['type'] . ' (' .
+                 show_readable_size(filesize($attached_file)) . ")<br>\n";
+        }
+
+        echo '<input type="submit" name="do_delete" value="' .
+             _("Delete selected attachments") . "\">\n" .
+             '</td></tr>';
+    }
+    /* End of attachment code */
+
+    echo '</TABLE>' . "\n";
+    if ($reply_id) {
+        echo '<input type=hidden name=reply_id value=' . $reply_id . ">\n";
+    }
+    echo '<INPUT TYPE=hidden NAME=mailbox VALUE="' . htmlspecialchars($mailbox) .
+         "\">\n" .
+         '</FORM>';
+    do_hook("compose_bottom");
+    echo '</BODY></HTML>' . "\n";
+}
+
+
+
+
 
-         echo "<input type=\"submit\" name=\"do_delete\" value=\""._("Delete selected attachments")."\">\n";
-         echo "</td></tr>";
-      }
-      // End of attachment code
 
-      echo "</TABLE>\n";
-      if ($reply_id) {
-         echo "<input type=hidden name=reply_id value=$reply_id>\n";
-      }
-      printf("<INPUT TYPE=hidden NAME=mailbox VALUE=\"%s\">\n", htmlspecialchars($mailbox));      
-      echo "</FORM>";
-      do_hook("compose_bottom");
-      echo "</BODY></HTML>\n";
-   }
 
    function showComposeButtonRow() {
       global $use_javascript_addr_book, $save_as_draft,