spelling mistake

[squirrelmail.git] / src / compose.php

diff --git a/src/compose.php b/src/compose.php
index 3a37f54f958a10e2f2958ebd1efb589e1c6846d6..8495f7eb7a8b89b12a6fb2194bc47b8a986a9029 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -14,7 +14,7 @@
     **
     ** $Id$
     **/
-
+    
    session_start();
 
    if (!isset($strings_php))
@@ -40,14 +40,17 @@
 
    include("../src/load_prefs.php");
 
+   if (!isset($attachments))
+       $attachments = array();
+
    // 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;
 
-      $send_to = sqStripSlashes(decodeHeader($send_to));
-      $send_to_cc = sqStripSlashes(decodeHeader($send_to_cc));
-      $send_to_bcc = sqStripSlashes(decodeHeader($send_to_bcc));
+      $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;
@@ -70,22 +73,22 @@
          } else {
             $body = "";
          }
-         
+        
          if ($message->header->type1 == "html")
             $body = strip_tags($body);
-         
+
          sqUnWordWrap($body);   
          $body_ary = explode("\n", $body);
          $i = count($body_ary) - 1;
-         while (isset($body_ary[$i]) && ereg("^[>\s]*$", $body_ary[$i])) {
+         while ($i >= 0 && ereg("^[>\\s]*$", $body_ary[$i])) {
             unset($body_ary[$i]);
             $i --;
          }
          $body = "";
-         for ($i=0; $i < count($body_ary); $i++) {
+         for ($i=0; isset($body_ary[$i]); $i++) {
             if (! $forward_id)
             {
-                if (ereg('^[\s>]+', $body_ary[$i]))
+                if (ereg('^[\\s>]+', $body_ary[$i]))
                 {
                     $body_ary[$i] = '>' . $body_ary[$i];
                 }
@@ -96,7 +99,7 @@
             }
             sqWordWrap($body_ary[$i], $editor_size - 1);
             $body .= $body_ary[$i] . "\n";
-            $body_ary[$i] = '';
+           unset($body_ary[$i]);
          }
          if ($forward_id)
          {
@@ -113,8 +116,6 @@
              $body = $bodyTop . $body;
          }
          
-         $body = ereg_replace('\\\\', '\\\\', $body);
-
          return;
       }
 
@@ -176,11 +177,6 @@
         // Write Attachment to file
         $fp = fopen ($attachment_dir.$localfilename, "w");
       fputs ($fp, decodeBody(mime_fetch_body($imapConnection, $forward_id, $message->header->entity_id), $message->header->encoding));
-      
-//      Don't know why these lines were included
-//        fgets($imapConnection, 256);
-//        fgets($imapConnection, 256);
-
       fclose ($fp);
       
       $attachments[$localfilename] = $filename;
@@ -201,10 +197,9 @@
          $send_to_bcc, $reply_id, $mailbox, $from_htmladdr_search,
          $location_of_buttons;
 
-      $subject = sqStripSlashes(decodeHeader($subject));
+      $subject = decodeHeader($subject);
       $reply_subj = decodeHeader($reply_subj);
       $forward_subj = decodeHeader($forward_subj);
-      $body = sqStripSlashes($body);
       
       if ($use_javascript_addr_book) {
          echo "\n<SCRIPT LANGUAGE=JavaScript><!--\n";
@@ -258,7 +253,6 @@
       echo "      </TD><TD BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
       if ($reply_subj) {
          $reply_subj = str_replace("\"", "'", $reply_subj);
-         $reply_subj = sqStripSlashes($reply_subj);
          $reply_subj = trim($reply_subj);
          if (substr(strtolower($reply_subj), 0, 3) != "re:")
             $reply_subj = "Re: $reply_subj";
@@ -266,7 +260,6 @@
                 htmlspecialchars($reply_subj));
       } else if ($forward_subj) {
          $forward_subj = str_replace("\"", "'", $forward_subj);
-         $forward_subj = sqStripSlashes($forward_subj);
          $forward_subj = trim($forward_subj);
          if ((substr(strtolower($forward_subj), 0, 4) != "fwd:") &&
              (substr(strtolower($forward_subj), 0, 5) != "[fwd:") &&
@@ -304,8 +297,6 @@
       echo "     <TD BGCOLOR=\"$color[0]\" VALIGN=TOP ALIGN=RIGHT>\n";
       echo "      <SMALL><BR></SMALL>"._("Attach:");
       echo "      </td><td ALIGN=left BGCOLOR=\"$color[0]\">\n";
-      //      echo "      <INPUT TYPE=\"hidden\" name=\"MAX_FILE_SIZE\"\n";
-      //      echo "      value=\"10000\">\n";
       echo "      <INPUT NAME=\"attachfile\" SIZE=48 TYPE=\"file\">\n";
       echo "      &nbsp;&nbsp;<input type=\"submit\" name=\"attach\"";
       echo " value=\"" . _("Add") ."\">\n";
@@ -395,6 +386,17 @@
       }
     }
 
+   // Workaround for RedHat PHP 4.0.4pl1-3
+   // Also for Konq problems?
+   if (isset($mailbox))     $mailbox = trim($mailbox);
+   if (isset($send_to))     $send_to = trim($send_to);
+   if (isset($send_to_cc))  $send_to_cc = trim($send_to_cc);
+   if (isset($send_to_bcc)) $send_to_bcc = trim($send_to_bcc);
+   if (isset($subject))     $subject = trim($subject);
+   if (isset($body))        $body = trim($body);
+   if (isset($attachfile))  $attachfile = trim($attachfile);
+   // End of workaround
+   
    if (!isset($mailbox) || $mailbox == "" || ($mailbox == "None"))
       $mailbox = "INBOX";
 
@@ -403,10 +405,10 @@
           $HTTP_POST_FILES['attachfile']['tmp_name'] &&
           $HTTP_POST_FILES['attachfile']['tmp_name'] != 'none')
           $AttachFailure = saveAttachedFiles();
-      if (checkInput(false) && ! isset($AttachFailure)) {
-         $urlMailbox = urlencode ($mailbox);
-        if (! isset($reply_id))
-            $reply_id = 0;
+      if (checkInput(false) && !isset($AttachFailure)) {
+         $urlMailbox = urlencode (trim($mailbox));
+         if (! isset($reply_id))
+             $reply_id = 0;
          sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id);
          header ("Location: right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=1");
       } else {
@@ -425,10 +427,6 @@
       is_logged_in();
       displayPageHeader($color, $mailbox);
 
-      $send_to = sqStripSlashes($send_to);
-      $send_to_cc = sqStripSlashes($send_to_cc);
-      $send_to_bcc = sqStripSlashes($send_to_bcc);
-      
       for ($i=0; $i < count($send_to_search); $i++) {
          if ($send_to)
             $send_to .= ", ";
@@ -485,5 +483,3 @@
       sqimap_logout($imapConnection);
    }
 ?>
- 
-