projects / squirrelmail.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fixed minor bug with deleting folders that had quotes in them
[squirrelmail.git] / src / compose.php
diff --git a/src/compose.php b/src/compose.php
index b42a551e6b9ef857788e5f3e25a383e31b6dabb4..3571c55ec5e4fba683e3ffe13b9988ac65f32fe9 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -7,30 +7,36 @@
     **  - Send mail
     **/
 
-   include("../config/config.php");
-   include("../functions/strings.php");
-   include("../functions/page_header.php");
-   include("../functions/imap.php");
-   include("../functions/mailbox.php");
-   include("../functions/date.php");
-   include("../functions/mime.php");
-   include("../functions/smtp.php");
-   include("../functions/display_messages.php");
+   if (!isset($config_php))
+      include("../config/config.php");
+   if (!isset($strings_php))
+      include("../functions/strings.php");
+   if (!isset($page_header_php))
+      include("../functions/page_header.php");
+   if (!isset($imap_php))
+      include("../functions/imap.php");
+   if (!isset($date_php))
+      include("../functions/date.php");
+   if (!isset($mime_php))
+      include("../functions/mime.php");
+   if (!isset($smtp_php))
+      include("../functions/smtp.php");
+   if (!isset($display_messages_php))
+      include("../functions/display_messages.php");
 
    include("../src/load_prefs.php");
 
-   echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
-   $imapConnection = loginToImapServer($username, $key, $imapServerAddress, 0);
-   displayPageHeader($color, "None");
-
    // 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 = decodeHeader($send_to);
+      $send_to_cc = decodeHeader($send_to_cc);
+
       if ($forward_id) {
-         selectMailbox($imapConnection, $mailbox, $numMessages);
-         $msg = fetchMessage($imapConnection, $forward_id, $mailbox);
+         sqimap_mailbox_select($imapConnection, $mailbox);
+         $msg = sqimap_get_message($imapConnection, $forward_id, $mailbox);
          
          if (containsType($msg, "text", "html", $ent_num)) {
             $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"]);
@@ -65,8 +71,8 @@
       }
       
       if ($reply_id) {
-         selectMailbox($imapConnection, $mailbox, $numMessages);
-         $msg = fetchMessage($imapConnection, $reply_id, $mailbox);
+         sqimap_mailbox_select($imapConnection, $mailbox);
+         $msg = sqimap_get_message($imapConnection, $reply_id, $mailbox);
          
          if (containsType($msg, "text", "html", $ent_num)) {
             $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false);
@@ -98,12 +104,8 @@
          }
       }
       
-      // Add some decoding information
-      $send_to = encodeEmailAddr($send_to);
-      // parses the field and returns only the email address
-      $send_to = decodeEmailAddr($send_to);
+      $send_to = sqimap_find_email($send_to);
       
-      $send_to = strtolower($send_to);
       $send_to = ereg_replace("\"", "", $send_to);
       $send_to = stripslashes($send_to);
       
@@ -118,14 +120,9 @@
             if ($sendcc[$i] == "")
                continue;
             
-            $sendcc[$i] = encodeEmailAddr($sendcc[$i]);
-            $sendcc[$i] = decodeEmailAddr($sendcc[$i]);
-            
-            $whofrom = encodeEmailAddr($msg["HEADER"]["FROM"]);
-            $whofrom = decodeEmailAddr($whofrom);
-            
-            $whoreplyto = encodeEmailAddr($msg["HEADER"]["REPLYTO"]);
-            $whoreplyto = decodeEmailAddr($whoreplyto);
+            $sendcc[$i] = sqimap_find_email($sendcc[$i]);
+            $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))) &&
@@ -143,16 +140,18 @@
    function showInputForm () {
       global $send_to, $send_to_cc, $reply_subj, $forward_subj, $body,
          $passed_body, $color, $use_signature, $signature, $editor_size,
-         $attachments, $subject;
+         $attachments, $subject, $newmail;
+
+      $subject = decodeHeader($subject);
+      $reply_subj = decodeHeader($reply_subj);
+      $forward_subj = decodeHeader($forward_subj);
 
       echo "\n<FORM action=\"compose.php\" METHOD=POST\n";
       echo "ENCTYPE=\"multipart/form-data\">\n";
       echo "<TABLE COLS=2 WIDTH=50 ALIGN=center CELLSPACING=0 BORDER=0>\n";
       echo "   <TR>\n";
       echo "      <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
-      echo "         <FONT FACE=\"Arial,Helvetica\">";
       echo _("To:");
-      echo " </FONT>\n";
       echo "      </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
       if ($send_to)
          echo "         <INPUT TYPE=TEXT NAME=send_to VALUE=\"$send_to\" SIZE=60><BR>";
@@ -162,7 +161,7 @@
       echo "   </TR>\n";
       echo "   <TR>\n";
       echo "      <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
-      echo "         <FONT FACE=\"Arial,Helvetica\">"._("CC").":</FONT>\n";
+      echo _("CC:");
       echo "      </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
       if ($send_to_cc)
          echo "         <INPUT TYPE=TEXT NAME=send_to_cc SIZE=60 VALUE=\"$send_to_cc\"><BR>";
@@ -172,7 +171,7 @@
       echo "   </TR>\n";
       echo "   <TR>\n";
       echo "      <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
-      echo "         <FONT FACE=\"Arial,Helvetica\">BCC:</FONT>\n";
+      echo _("BCC:");
       echo "      </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
       if ($send_to_bcc)
          echo "         <INPUT TYPE=TEXT NAME=send_to_bcc VALUE=\"$send_to_bcc\" SIZE=60><BR>";
@@ -182,9 +181,7 @@
       echo "   </TR>\n";
       echo "   <TR>\n";
       echo "      <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
-      echo "         <FONT FACE=\"Arial,Helvetica\">";
       echo _("Subject:");
-      echo " </FONT>\n";
       echo "      </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
       if ($reply_subj) {
          $reply_subj = str_replace("\"", "'", $reply_subj);
@@ -211,7 +208,7 @@
 
       echo "   <TR>\n";
       echo "      <TD BGCOLOR=\"$color[4]\" COLSPAN=2>\n";
-      if ($use_signature == true)
+      if ($use_signature == true && $newmail == true)
          echo "         &nbsp;&nbsp;<TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>". $body . "\n\n-- \n".$signature."</TEXTAREA><BR>";
       else
          echo "         &nbsp;&nbsp;<TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>".$body."</TEXTAREA><BR>\n";
@@ -224,8 +221,7 @@
       // This code is for attachments
       echo "   <tr>\n";
       echo "     <TD WIDTH=50 BGCOLOR=\"$color[0]\" VALIGN=TOP ALIGN=RIGHT>\n";
-      echo "      <FONT FACE=\"Arial,Helvetica\">";
-      echo "      <SMALL><BR></SMALL>"._("Attach:")."</FONT>\n";
+      echo "      <SMALL><BR></SMALL>"._("Attach:");
       echo "      </td><td width=% ALIGN=left BGCOLOR=\"$color[0]\">\n";
       //      echo "      <INPUT TYPE=\"hidden\" name=\"MAX_FILE_SIZE\"\n";
       //      echo "      value=\"10000\">\n";
@@ -254,10 +250,9 @@
    }
 
    function showSentForm () {
-      echo "<FONT FACE=\"Arial,Helvetica\">";
       echo "<BR><BR><BR><CENTER><B>Message Sent!</B><BR><BR>";
       echo "You will be automatically forwarded.<BR>If not, <A HREF=\"right_main.php\">click here</A>";
-      echo "</CENTER></FONT>";
+      echo "</CENTER>";
    }
 
    function checkInput () {
@@ -280,11 +275,19 @@
    if(isset($send)) {
       if (checkInput()) {
          sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body);
-         showSentForm();
+         header ("Location: right_main.php");
       } else {
+         echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
+         $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+         displayPageHeader($color, "None");
+
          showInputForm();
       }
    } else if (isset($attach)) {
+      echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
+      $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+      displayPageHeader($color, "None");
+
       $localfilename = md5("$attachfile, $attachfile_name, $REMOTE_IP, $REMOTE_PORT, $UNIQUE_ID, and everything else that may add entropy");
       $localfilename = $localfilename;
       
@@ -309,15 +312,24 @@
       
       showInputForm();
    } else if (isset($do_delete)) {
+      echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
+      $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+      displayPageHeader($color, "None");
+
       while (list($key, $localname) = each($delete)) {
-         array_splice ($attachments, $localname, 1);
+         array_splice ($attachments, $key, 1);
          unlink ($attachment_dir.$localname);
          unlink ($attachment_dir.$localname.".info");
       }
 
       showInputForm();
    } else {
-      Newmail();
+      echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
+      $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+      displayPageHeader($color, "None");
+
+      $newmail = true;
+      newMail();
       showInputForm();
    }
 ?>
Unnamed repository; edit this file 'description' to name the repository.