Added a counter pref and a fix for the imapid

[squirrelmail.git] / src / compose.php

diff --git a/src/compose.php b/src/compose.php
index 176acee74b4265d1b72db1dba4b388205ccc1bcf..5dc425d63be4903da135422e1ddcaf82efa1cfed 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -1,19 +1,20 @@
 <?php
+
    /**
-    * compose.php
-    *
-    * Copyright (c) 1999-2000 The SquirrelMail development team
-    * Licensed under the GNU GPL. For full terms see the file COPYING.
-    *
-    * This code sends a mail.
-    *
-    * There are 4 modes of operation:
-    *    - Start new mail
-    *    - Add an attachment
-    *    - Send mail
-    *    - Save As Draft
-    *  
-    * $Id$
+    **  compose.php
+    **
+    **  Copyright (c) 1999-2001 The SquirrelMail development team
+    **  Licensed under the GNU GPL. For full terms see the file COPYING.
+    **
+    **  This code sends a mail.
+    **
+    **  There are 4 modes of operation:
+    **     - Start new mail
+    **     - Add an attachment
+    **     - Send mail
+    **     - Save As Draft
+    **
+    **  $Id$
     **/
 
    require_once('../src/validate.php');
@@ -341,8 +342,8 @@
 
       // This code is for attachments
       echo "   <tr>\n";
-      echo "     <TD BGCOLOR=\"$color[0]\" VALIGN=TOP ALIGN=RIGHT>\n";
-      echo "      <SMALL><BR></SMALL>"._("Attach:");
+      echo "     <TD BGCOLOR=\"$color[0]\" VALIGN=MIDDLE ALIGN=RIGHT>\n";
+      echo        _("Attach:");
       echo "      </td><td ALIGN=left BGCOLOR=\"$color[0]\">\n";
       echo "      <INPUT NAME=\"attachfile\" SIZE=48 TYPE=\"file\">\n";
       echo "      &nbsp;&nbsp;<input type=\"submit\" name=\"attach\"";
@@ -393,7 +394,7 @@
       echo "\n    <INPUT TYPE=SUBMIT NAME=send VALUE=\"". _("Send") . "\">\n";
 
       if ($save_as_draft) {
-          echo "<input type=\"submit\" name =\"draft\" value=\"Save Draft\">\n";
+          echo '<input type="submit" name ="draft" value="' . _("Save Draft") . "\">\n";
       }
       if ($default_use_priority) {
         if(!isset($mailprio)) {
@@ -453,7 +454,7 @@
       $attachments[] = $newAttachment;
     }
 
-   if (!isset($mailbox) || $mailbox == "" || ($mailbox == "None"))
+   if (!isset($mailbox) || $mailbox == '' || ($mailbox == 'None'))
       $mailbox = "INBOX";
 
    if (isset($draft)) {
@@ -512,7 +513,13 @@
 
          do_hook("compose_send");
 
-         if (!sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id, $mailprio)) {
+         if (! isset($mailprio))
+           $Result = sendMessage($send_to, $send_to_cc, $send_to_bcc, 
+                                 $subject, $body, $reply_id);
+        else
+           $Result = sendMessage($send_to, $send_to_cc, $send_to_bcc,
+                                 $subject, $body, $reply_id, $mailprio);
+         if (! $Result) {
             showInputForm();
             exit();
          }