Workaround for the "catalan" bug. This leaves blank language

[squirrelmail.git] / src / compose.php

diff --git a/src/compose.php b/src/compose.php
index 6cae01295894fb8b97bd920b39775df91c327c3e..fef3d070c65c89c28c104035f8a4a7963d98470b 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -1,28 +1,45 @@
 <?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$
-    **/
-
-   require_once('../src/validate.php');
-   require_once('../functions/imap.php');
-   require_once('../functions/date.php');
-   require_once('../functions/mime.php');
-   require_once('../functions/smtp.php');
-   require_once('../functions/display_messages.php');
-   require_once('../functions/plugin.php');
+
+/**
+ * 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$
+ */
+
+/*****************************************************************/
+/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
+/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
+/***    + Base level indent should begin at left margin, as    ***/
+/***      the require_once below looks.                        ***/
+/***    + All identation should consist of four space blocks   ***/
+/***    + Tab characters are evil.                             ***/
+/***    + all comments should use "slash-star ... star-slash"  ***/
+/***      style -- no pound characters, no slash-slash style   ***/
+/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
+/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
+/***    + Please use ' instead of ", when possible. Note "     ***/
+/***      should always be used in _( ) function calls.        ***/
+/*** Thank you for your help making the SM code more readable. ***/
+/*****************************************************************/
+
+require_once('../src/validate.php');
+require_once('../functions/imap.php');
+require_once('../functions/date.php');
+require_once('../functions/mime.php');
+require_once('../functions/smtp.php');
+require_once('../functions/display_messages.php');
+require_once('../functions/plugin.php');
 
    if (!isset($attachments))
    {
@@ -341,8 +358,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\"";
@@ -453,7 +470,7 @@
       $attachments[] = $newAttachment;
     }
 
-   if (!isset($mailbox) || $mailbox == "" || ($mailbox == "None"))
+   if (!isset($mailbox) || $mailbox == '' || ($mailbox == 'None'))
       $mailbox = "INBOX";
 
    if (isset($draft)) {
@@ -514,10 +531,10 @@
 
          if (! isset($mailprio))
            $Result = sendMessage($send_to, $send_to_cc, $send_to_bcc, 
-                                 $subject, $body, $reply_id)
+                                 $subject, $body, $reply_id);
         else
-           $Result = sendMessage($send_to, $send_to_cc, $send_to_bcc, 
-                                 $subject, $body, $reply_id, $mailprio)
+           $Result = sendMessage($send_to, $send_to_cc, $send_to_bcc,
+                                 $subject, $body, $reply_id, $mailprio);
          if (! $Result) {
             showInputForm();
             exit();