X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fcompose.php;h=eb6dbcf86da664b403f48c6d5a0bbf45cf932f68;hb=f17728d175ccf6056977ef6443e65701c04417e2;hp=3b4782dd9eeba5e383f3e8b98490d52f7406722f;hpb=d07176935b853bf32aa1157a1fe8c4ad725e62a2;p=squirrelmail.git

diff --git a/src/compose.php b/src/compose.php
index 3b4782dd..eb6dbcf8 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -14,34 +14,25 @@
     **
     ** $Id$
     **/
-    
-   session_start();
-
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($config_php))
-      include("../config/config.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");
-   if (!isset($auth_php))
-      include ("../functions/auth.php");
-   if (!isset($plugin_php))
-      include ("../functions/plugin.php");
 
+   include('../src/validate.php');
+   include("../functions/strings.php");
+   include("../config/config.php");
+   include("../functions/page_header.php");
+   include("../functions/imap.php");
+   include("../functions/date.php");
+   include("../functions/mime.php");
+   include("../functions/smtp.php");
+   include("../functions/display_messages.php");
+   include ("../functions/plugin.php");
    include("../src/load_prefs.php");
 
    if (!isset($attachments))
+   {
        $attachments = array();
+       session_register('attachments');
+   }
+
 
    // This function is used when not sending or adding attachments
    function newMail () {
@@ -155,47 +146,52 @@
    function getAttachments($message) {
       global $mailbox, $attachments, $attachment_dir, $imapConnection,
              $ent_num, $forward_id;
-      
+
       if (!$message) {
            sqimap_mailbox_select($imapConnection, $mailbox);
-           $message = sqimap_get_message($imapConnection, $forward_id, $mailbox); }
-      
-      if (!$message->entities) {
-      if ($message->header->entity_id != $ent_num) {
-      $filename = decodeHeader($message->header->filename);
-      
-      if ($filename == "")
-              $filename = "untitled-".$message->header->entity_id;
+           $message = sqimap_get_message($imapConnection, $forward_id, 
+	       $mailbox);
+      }
       
-      $localfilename = md5($filename.", $REMOTE_IP, REMOTE_PORT, $UNIQUE_ID, extra-stuff here");
+      if (count($message->entities) == 0) {
+          if ($message->header->entity_id != $ent_num) {
+              $filename = decodeHeader($message->header->filename);
       
-        // Write File Info
-        $fp = fopen ($attachment_dir.$localfilename.".info", "w");
-        fputs ($fp, strtolower($message->header->type0)."/".strtolower($message->header->type1)."\n".$filename."\n");
-        fclose ($fp);
-
-        // 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));
-      fclose ($fp);
+              if ($filename == "")
+                  $filename = "untitled-".$message->header->entity_id;
       
-      $attachments[$localfilename] = $filename;
+              $localfilename = GenerateRandomString(32, '', 7);
+	      while (file_exists($attachment_dir . $localfilename))
+	          $localfilename = GenerateRandomString(32, '', 7);
+
+              $newAttachment['localfilename'] = $localfilename;
+	      $newAttachment['remotefilename'] = $filename;
+	      $newAttachment['type'] = strtolower($message->header->type0 .
+	         '/' . $message->header->type1);
+
+              // 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));
+              fclose ($fp);
       
-      }
+              $attachments[] = $newAttachment;
+          }
       } else {
-              for ($i = 0; $i < count($message->entities); $i++) {
+          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, $editor_size,
-         $attachments, $subject, $newmail, $use_javascript_addr_book,
-         $send_to_bcc, $reply_id, $mailbox, $from_htmladdr_search,
-         $location_of_buttons;
+         $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;
 
       $subject = decodeHeader($subject);
       $reply_subj = decodeHeader($reply_subj);
@@ -259,11 +255,10 @@
          printf("         <INPUT TYPE=text NAME=subject SIZE=60 VALUE=\"%s\">",
                 htmlspecialchars($reply_subj));
       } else if ($forward_subj) {
-         $forward_subj = str_replace("\"", "'", $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:"))
+         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));
@@ -280,7 +275,10 @@
       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)) {
-         echo "\n\n-- \n" . htmlspecialchars($signature);
+        if ( $prefix_sig == true )
+          echo "\n\n-- \n" . htmlspecialchars($signature);
+        else
+          echo "\n\n" . htmlspecialchars($signature);
       }
       echo "</TEXTAREA><BR>\n";
       echo "      </TD>\n";
@@ -302,13 +300,16 @@
       echo " value=\"" . _("Add") ."\">\n";
       echo "     </td>\n";
       echo "   </tr>\n";
-      if (isset($attachments) && count($attachments)>0) {
+      if (count($attachments))
+      {
          echo "<tr><td bgcolor=\"$color[0]\" align=right>\n";
          echo "&nbsp;";
          echo "</td><td align=left bgcolor=\"$color[0]\">";
-         while (list($localname, $remotename) = each($attachments)) {
-            echo "<input type=\"checkbox\" name=\"delete[]\" value=\"$localname\">\n";
-            echo "$remotename <input type=\"hidden\" name=\"attachments[$localname]\" value=\"$remotename\"><br>\n";
+	 foreach ($attachments as $key => $info) {
+            echo "<input type=\"checkbox\" name=\"delete[]\" value=\"$key\">\n";
+	    echo $info['remotefilename'] . " - " . $info['type'] . " (";
+	    echo show_readable_size(filesize($attachment_dir . 
+	        $info['localfilename'])) . ")<br>\n";
          }
          
          echo "<input type=\"submit\" name=\"do_delete\" value=\""._("Delete selected attachments")."\">\n";
@@ -323,6 +324,7 @@
    
    function showComposeButtonRow() {
       global $use_javascript_addr_book;
+      
       echo "   <TR><td>\n   </td><td>\n";
       if ($use_javascript_addr_book) {
          echo "      <SCRIPT LANGUAGE=JavaScript><!--\n document.write(\"";
@@ -341,12 +343,6 @@
       echo "   </TR>\n\n";
    }
 
-   function showSentForm () {
-      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>";
-   }
-
    function checkInput ($show) {
       /** I implemented the $show variable because the error messages
           were getting sent before the page header.  So, I check once
@@ -367,23 +363,22 @@
    function saveAttachedFiles() {
       global $HTTP_POST_FILES, $attachment_dir, $attachments;
       
-      is_logged_in();
       $localfilename = GenerateRandomString(32, '', 7);
-      
+      while (file_exists($attachment_dir . $localfilename))
+          $localfilename = GenerateRandomString(32, '', 7);
+
       if (!@rename($HTTP_POST_FILES['attachfile']['tmp_name'], $attachment_dir.$localfilename)) {
          if (!@copy($HTTP_POST_FILES['attachfile']['tmp_name'], $attachment_dir.$localfilename)) {
             return true;
          }
       }
+   
+      $newAttachment['localfilename'] = $localfilename;
+      $newAttachment['remotefilename'] = $HTTP_POST_FILES['attachfile']['name'];
+      $newAttachment['type'] = 
+         strtolower($HTTP_POST_FILES['attachfile']['type']);
       
-      if (!isset($failed) || !$failed) {
-         // Write information about the file
-         $fp = fopen ($attachment_dir.$localfilename.".info", "w");
-         fputs ($fp, $HTTP_POST_FILES['attachfile']['type']."\n".$HTTP_POST_FILES['attachfile']['name']."\n");
-         fclose ($fp);
-
-         $attachments[$localfilename] = $HTTP_POST_FILES['attachfile']['name'];
-      }
+      $attachments[] = $newAttachment;
     }
   
    function SqConvertRussianCharsets(){
@@ -417,7 +412,7 @@
    if (!isset($mailbox) || $mailbox == "" || ($mailbox == "None"))
       $mailbox = "INBOX";
 
-   if(isset($send)) {
+   if (isset($send)) {
       if (isset($HTTP_POST_FILES['attachfile']) &&
           $HTTP_POST_FILES['attachfile']['tmp_name'] &&
           $HTTP_POST_FILES['attachfile']['tmp_name'] != 'none')
@@ -426,7 +421,10 @@
          $urlMailbox = urlencode (trim($mailbox));
          if (! isset($reply_id))
              $reply_id = 0;
-         sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id);
+         // Set $default_charset to correspond with the user's selection
+	 // of language interface.
+	 set_my_charset();
+	 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 {
          //$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
@@ -441,23 +439,44 @@
          //sqimap_logout($imapConnection);
       }
    } else if (isset($html_addr_search_done)) {
-      is_logged_in();
       displayPageHeader($color, $mailbox);
 
-      for ($i=0; $i < count($send_to_search); $i++) {
-         if ($send_to)
-            $send_to .= ", ";
-         $send_to .= $send_to_search[$i];   
+      if (isset($send_to_search) && is_array($send_to_search))
+      {
+         for ($i=0; $i < count($send_to_search); $i++) {
+            if ($send_to)
+               $send_to .= ", ";
+            $send_to .= $send_to_search[$i];   
+         }
       }
       
-      for ($i=0; $i < count($send_to_cc_search); $i++) {
-         if ($send_to_cc)
-            $send_to_cc .= ", ";
-         $send_to_cc .= $send_to_cc_search[$i];   
+      if (isset($send_to_cc_search) && is_array($send_to_cc_search))
+      {
+         for ($i=0; $i < count($send_to_cc_search); $i++) {
+            if ($send_to_cc)
+               $send_to_cc .= ", ";
+            $send_to_cc .= $send_to_cc_search[$i];   
+         }
+      }
+      
+      if (isset($send_to_bcc_search) && is_array($send_to_bcc_search))
+      {
+         for ($i=0; $i < count($send_to_bcc_search); $i++) {
+            if ($send_to_bcc)
+               $send_to_bcc .= ", ";
+            $send_to_bcc .= $send_to_bcc_search[$i];   
+         }
       }
       
       showInputForm();
    } else if (isset($html_addr_search)) {
+      if (isset($HTTP_POST_FILES['attachfile']) &&
+          $HTTP_POST_FILES['attachfile']['tmp_name'] &&
+          $HTTP_POST_FILES['attachfile']['tmp_name'] != 'none')
+      {
+          if (saveAttachedFiles())
+                plain_error_message(_("Could not move/copy file. File not attached"), $color);
+      }
       // I am using an include so as to elminiate an extra unnecessary click.  If you
       // can think of a better way, please implement it.
       include ("./addrbook_search_html.php");
@@ -467,36 +486,53 @@
       displayPageHeader($color, $mailbox);
       showInputForm();
    } else if (isset($do_delete)) {
-      is_logged_in();
       displayPageHeader($color, $mailbox);
 
-      while (list($lkey, $localname) = each($delete)) {
-         unset ($attachments[$localname]);
-         unlink ($attachment_dir.$localname);
-         unlink ($attachment_dir.$localname.".info");
+      if (isset($delete) && is_array($delete))
+      {
+         foreach($delete as $index)
+         {
+            unlink ($attachment_dir.$attachments[$index]['localfilename']);
+            unset ($attachments[$index]);
+	 }
       }
 
       showInputForm();
-	} else if (isset($smtpErrors)) {
-      $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-      displayPageHeader($color, $mailbox);
-
-      $newmail = true;
-      if ($forward_id && $ent_num)  getAttachments(0);
-              
-      newMail();
-      showInputForm();
-      sqimap_logout($imapConnection);
    } else {
-      $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+      // This handles the default case as well as the error case
+      // (they had the same code) --> if (isset($smtpErrors))
+      $imapConnection = sqimap_login($username, $key, $imapServerAddress, 
+          $imapPort, 0);
       displayPageHeader($color, $mailbox);
 
       $newmail = true;
-		
-      if (isset($forward_id) && isset($ent_num))  getAttachments(0);
+
+      ClearAttachments();
+
+      if (isset($forward_id) && $forward_id && isset($ent_num) && $ent_num)
+          getAttachments(0);
               
       newMail();
       showInputForm();
       sqimap_logout($imapConnection);
    }
+   
+   
+   
+   
+   function ClearAttachments()
+   {
+       global $attachments, $attachment_dir;
+       
+       foreach ($attachments as $info)
+       {
+           if (file_exists($attachment_dir . $info['localfilename']))
+	   {
+               unlink($attachment_dir . $info['localfilename']);
+	   }
+       }
+       
+       $attachments = array();
+   }
+   
 ?>