X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=inline;f=src%2Fcompose.php;h=10bb65a54a5e08f03ed4ce218d4deb112cba5fb1;hb=8ef72f3300cc3d2c2b781cb91ae67aecdd9df181;hp=73e9d9661eb5a58a7fbdd763bd11178824530a64;hpb=511f781679470bc91aa737027f44524c1a2ad757;p=squirrelmail.git

diff --git a/src/compose.php b/src/compose.php
index 73e9d966..10bb65a5 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -14,37 +14,22 @@
     **
     ** $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/load_prefs.php");
+
+   include('../src/validate.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");
 
    if (!isset($attachments))
    {
        $attachments = array();
+       session_register('attachments');
    }
-   
+
+
    // This function is used when not sending or adding attachments
    function newMail () {
       global $forward_id, $imapConnection, $msg, $ent_num, $body_ary, $body,
@@ -75,7 +60,7 @@
          } else {
             $body = "";
          }
-	 
+         
          if ($message->header->type1 == "html")
             $body = strip_tags($body);
 
@@ -90,7 +75,7 @@
          for ($i=0; isset($body_ary[$i]); $i++) {
             if (! $forward_id)
             {
-                if (ereg('^[\\s>]+', $body_ary[$i]))
+                if (ereg('^[ >]+', $body_ary[$i]))
                 {
                     $body_ary[$i] = '>' . $body_ary[$i];
                 }
@@ -101,7 +86,7 @@
             }
             sqWordWrap($body_ary[$i], $editor_size - 1);
             $body .= $body_ary[$i] . "\n";
-	    unset($body_ary[$i]);
+            unset($body_ary[$i]);
          }
          if ($forward_id)
          {
@@ -157,11 +142,11 @@
    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);
+               $mailbox);
       }
       
       if (count($message->entities) == 0) {
@@ -172,23 +157,23 @@
                   $filename = "untitled-".$message->header->entity_id;
       
               $localfilename = GenerateRandomString(32, '', 7);
-	      while (isset($attachments[$localfilename]))
-	          $localfilename = GenerateRandomString(32, '', 7);
-      
-              // 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);
+              while (file_exists($attachment_dir . $localfilename))
+                  $localfilename = GenerateRandomString(32, '', 7);
+
+              $newAttachment = array();
+              $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");
+              $fp = fopen ($attachment_dir.$localfilename, 'w');
               fputs ($fp, decodeBody(mime_fetch_body($imapConnection, 
-	          $forward_id, $message->header->entity_id), 
-		  $message->header->encoding));
+                  $forward_id, $message->header->entity_id), 
+                  $message->header->encoding));
               fclose ($fp);
       
-              $attachments[$localfilename] = $filename;
+              $attachments[] = $newAttachment;
           }
       } else {
           for ($i = 0; $i < count($message->entities); $i++) {
@@ -203,7 +188,8 @@
          $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;
+         $from_htmladdr_search, $location_of_buttons, $attachment_dir,
+	 $username, $data_dir, $identity;
 
       $subject = decodeHeader($subject);
       $reply_subj = decodeHeader($reply_subj);
@@ -222,7 +208,7 @@
 
       echo "\n<FORM name=compose action=\"compose.php\" METHOD=POST ENCTYPE=\"multipart/form-data\"";
       do_hook("compose_form");
-	  echo ">\n";
+          echo ">\n";
       if ($reply_id) {
          echo "<input type=hidden name=reply_id value=$reply_id>\n";
       }                 
@@ -231,10 +217,38 @@
 
       if ($location_of_buttons == 'top') showComposeButtonRow();
 
+      $idents = getPref($data_dir, $username, 'identities');
+      if ($idents != '' && $idents > 1)
+      {
+         echo "   <TR>\n";
+         echo "      <TD BGCOLOR=\"$color[4]\" WIDTH=\"10%\" ALIGN=RIGHT>\n";
+         echo _("From:");
+         echo "      </TD><TD BGCOLOR=\"$color[4]\" WIDTH=\"90%\">\n";
+	 echo "<select name=identity>\n";
+	 echo "<option value=default>" . 
+	    htmlspecialchars(getPref($data_dir, $username, 'full_name'));
+	 $em = getPref($data_dir, $username, 'email_address');
+	 if ($em != '')
+	    echo htmlspecialchars(' <' . $em . '>') . "\n";
+	 for ($i = 1; $i < $idents; $i ++) {
+ 	    echo '<option value="' . $i . '"';
+	    if (isset($identity) && $identity == $i)
+	       echo ' SELECTED';
+	    echo '>';
+	    echo htmlspecialchars(getPref($data_dir, $username, 'full_name' . 
+	                                  $i));
+  	    $em = getPref($data_dir, $username, 'email_address' . $i);
+	    if ($em != '')
+	       echo htmlspecialchars(' <' . $em . '>') . "\n";
+	 }
+	 echo "</select>\n";
+         echo "      </TD>\n";
+         echo "   </TR>\n";
+      }
       echo "   <TR>\n";
-      echo "      <TD BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
+      echo "      <TD BGCOLOR=\"$color[4]\" WIDTH=\"10%\" ALIGN=RIGHT>\n";
       echo _("To:");
-      echo "      </TD><TD BGCOLOR=\"$color[4]\">\n";
+      echo "      </TD><TD BGCOLOR=\"$color[4]\" WIDTH=\"90%\">\n";
       printf("         <INPUT TYPE=text NAME=\"send_to\" VALUE=\"%s\" SIZE=60><BR>\n",
              htmlspecialchars($send_to));
       echo "      </TD>\n";
@@ -267,11 +281,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));
@@ -304,21 +317,25 @@
       }
       
       // This code is for attachments
-      echo "   <tr bgcolor=\"$color[0]\">\n";
-      echo "     <TD VALIGN=TOP ALIGN=RIGHT>"._("Attach:");
-      echo "      </td><td ALIGN=left>\n";
+      echo "   <tr>\n";
+      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 NAME=\"attachfile\" SIZE=48 TYPE=\"file\">\n";
       echo "      &nbsp;&nbsp;<input type=\"submit\" name=\"attach\"";
       echo " value=\"" . _("Add") ."\">\n";
       echo "     </td>\n";
       echo "   </tr>\n";
-      if (count($attachments) > 0) {
-         echo "<tr bgcolor=\"$color[0]\"><td align=right>\n";
+      if (count($attachments))
+      {
+         echo "<tr><td bgcolor=\"$color[0]\" align=right>\n";
          echo "&nbsp;";
-         echo "</td><td align=left>";
-	 foreach ($attachments as $localname => $remotename) {
-            echo "<input type=\"checkbox\" name=\"delete[]\" value=\"$localname\">\n";
-            echo "$remotename <input type=\"hidden\" name=\"attachments[$localname]\" value=\"$remotename\"><br>\n";
+         echo "</td><td align=left bgcolor=\"$color[0]\">";
+         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";
@@ -333,6 +350,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(\"";
@@ -344,6 +362,11 @@
          echo "      <input type=submit name=\"html_addr_search\" value=\""._("Addresses")."\">";
       }   
       echo "\n    <INPUT TYPE=SUBMIT NAME=send VALUE=\"". _("Send") . "\">\n";
+      echo "\n    ". _("Priority") .":<select name=\"mailprio\">".
+           "\n                        <option value=1>". _("High") ."</option>".
+           "\n                        <option value=3 selected>". _("Normal") ."</option>".
+           "\n                        <option value=5>". _("Low") ."</option>".
+           "\n                      </select>";
       
       do_hook("compose_button_row");
 
@@ -351,12 +374,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
@@ -377,59 +394,31 @@
    function saveAttachedFiles() {
       global $HTTP_POST_FILES, $attachment_dir, $attachments;
       
-      is_logged_in();
       $localfilename = GenerateRandomString(32, '', 7);
-      while (isset($attachments[$localfilename]))
+      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;
          }
       }
-      
-      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);
+   
+      $newAttachment['localfilename'] = $localfilename;
+      $newAttachment['remotefilename'] = $HTTP_POST_FILES['attachfile']['name'];
+      $newAttachment['type'] = 
+         strtolower($HTTP_POST_FILES['attachfile']['type']);
 
-         $attachments[$localfilename] = $HTTP_POST_FILES['attachfile']['name'];
-      }
+      if ($newAttachment['type'] == "")
+         $newAttachment['type'] = 'application/octet-stream';
+
+      $attachments[] = $newAttachment;
     }
   
-   function SqConvertRussianCharsets(){
-    //
-    // This function is here because Russian Apache is a bastard when it comes to
-    // attachments. The solution is to turn off attachment recoding for multipart
-    // forms and do it manually.
-    // See graf@relhum.org for support.
-    //
-    global $CHARSET, $SOURCE_CHARSET, $send_to, $send_to_cc, $send_to_bcc, $subject, $body;
-    $charset_ary = array("koi8-r" => "k",
-   			 "windows-1251" => "w",
-			 "ibm866" => "a",
-			 "ISO-8859-5" => "i");
-    $body = convert_cyr_string($body, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]);
-    $send_to = convert_cyr_string($send_to, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]);
-    $send_to_cc = convert_cyr_string($send_to_cc, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]);
-    $send_to_bcc = convert_cyr_string($send_to_bcc, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]);
-    $subject = convert_cyr_string($subject, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]);
-   } // end SqConvertRussianCharsets()
-   
-   // Russian Apache sets $CHARSET. See if this is Russian Apache.
-   // If so, check if the source charset (koi8-r) is different from the 
-   // one submitted by the browser. If so, recode the parts of the form
-   // to the needed format so SM can proceed and not mangle the cyrillic
-   // input.
-   // See graf@relhum.org for support.
-   //
-   if (isset($CHARSET) && $CHARSET != $SOURCE_CHARSET) SqConvertRussianCharsets();
-   
    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')
@@ -439,15 +428,43 @@
          if (! isset($reply_id))
              $reply_id = 0;
          // 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");
+         // of language interface.
+         set_my_charset();
+
+         // This is to change all newlines to \n
+	 // We'll change them to \r\n later (in the sendMessage function)
+	 $body = str_replace("\r\n", "\n", $body);
+	 $body = str_replace("\r", "\n", $body);
+	 
+	 // Rewrap $body so that no line is bigger than $editor_size
+	 // This should only really kick in the sqWordWrap function
+	 // if the browser doesn't support "HARD" as the wrap type
+	 // Or, in Opera's case, something goes wrong.
+	 $body = explode("\n", $body);
+	 $newBody = '';
+	 foreach ($body as $line) {
+	    $line = rtrim($line);
+	    if (strlen($line) <= $editor_size + 1)
+	       $newBody .= $line . "\n";
+	    else {
+	       sqWordWrap($line, $editor_size) . "\n";
+	       $newBody .= $line;
+	    }
+	 }
+	 $body = $newBody;
+	 
+         do_hook("compose_send");
+
+         if (! sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id, $mailprio)) {
+	    showInputForm(); 
+	    exit();
+	 }
+	 Header("Location: right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=1");
       } else {
          //$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
          displayPageHeader($color, $mailbox);
          
-         if ($AttachFailure)
+         if (isset($AttachFailure))
              plain_error_message(_("Could not move/copy file. File not attached"), $color);
 
          checkInput(true);
@@ -456,23 +473,37 @@
          //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];   
-      }
-      
-      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_search) && is_array($send_to_search)) {
+         foreach ($send_to_search as $k => $v) {
+	    if (substr($k, 0, 1) == 'T') {
+               if ($send_to)
+                  $send_to .= ', ';
+               $send_to .= $v;
+	    }
+	    elseif (substr($k, 0, 1) == 'C') {
+	       if ($send_to_cc)
+	          $send_to_cc .= ', ';
+	       $send_to_cc .= $v;
+	    }
+	    elseif (substr($k, 0, 1) == 'B') {
+	       if ($send_to_bcc)
+	          $send_to_bcc .= ', ';
+	       $send_to_bcc .= $v;
+	    }
+         }
       }
       
       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");
@@ -482,13 +513,15 @@
       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();
@@ -500,6 +533,9 @@
       displayPageHeader($color, $mailbox);
 
       $newmail = true;
+
+      ClearAttachments();
+
       if (isset($forward_id) && $forward_id && isset($ent_num) && $ent_num)
           getAttachments(0);
               
@@ -507,4 +543,20 @@
       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();
+   }
+   
 ?>