fixed a couple of bugs in folder manipulation, in particular:

[squirrelmail.git] / src / compose.php

diff --git a/src/compose.php b/src/compose.php
index ed4e4e2ff1d73b3298692a60b3aa571a76be7787..746c10a1d05f20a307944dad0f64bfcc5ef962d6 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -147,7 +147,7 @@
 
       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 "<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\">";
@@ -201,54 +201,55 @@
              (substr(strtolower($forward_subj), 0, 5) != "[fwd:") &&
              (substr(strtolower($forward_subj), 0, 6) != "[ fwd:"))
             $forward_subj = "[Fwd: $forward_subj]";
-         echo "         <INPUT TYPE=TEXT NAME=subject SIZE=60 VALUE=\"$forward_subj\">";
+         echo "         <INPUT TYPE=TEXT NAME=subject SIZE=50 VALUE=\"$forward_subj\">";
       } else {
-         echo "         <INPUT TYPE=TEXT NAME=subject VALUE=\"$subject\" SIZE=60>";
+         echo "         <INPUT TYPE=TEXT NAME=subject VALUE=\"$subject\" SIZE=50>";
       }
-      echo "      &nbsp;&nbsp;<INPUT TYPE=SUBMIT NAME=send VALUE=\"";
-      echo _("Send");
-      echo "\"><BR>\n";
+      echo "&nbsp;&nbsp;<INPUT TYPE=SUBMIT NAME=send VALUE=\"". _("Send") . "\">";
       echo "      </TD>\n";
       echo "   </TR>\n";
 
+      echo "   <TR>\n";
+      echo "      <TD BGCOLOR=\"$color[4]\" COLSPAN=2>\n";
+      if ($use_signature == true)
+         echo "         &nbsp;&nbsp;<TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>". $body . "\n\n".$signature."</TEXTAREA><BR>";
+      else
+         echo "         &nbsp;&nbsp;<TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>".$body."</TEXTAREA><BR>\n";
+      echo "      </TD>\n";
+      echo "   </TR>\n";
+      echo "   <TR><TD COLSPAN=2 ALIGN=CENTER><INPUT TYPE=SUBMIT NAME=send VALUE=\"";
+      echo _("Send");
+      echo "\"></TD></TR>\n";
+      
       // This code is for attachments
       echo "   <tr>\n";
-      echo "     <TD WIDTH=50 BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
+      echo "     <TD WIDTH=50 BGCOLOR=\"$color[0]\" VALIGN=TOP ALIGN=RIGHT>\n";
       echo "      <FONT FACE=\"Arial,Helvetica\">";
-      echo "      "._("Attach:")."</FONT>\n";
-      echo "      </TD><TD WIDTH=% BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
+      echo "      <SMALL><BR></SMALL>"._("Attach:")."</FONT>\n";
+      echo "      </td><td width=% ALIGN=left BGCOLOR=\"$color[0]\">\n";
       //      echo "      <INPUT TYPE=\"hidden\" name=\"MAX_FILE_SIZE\"\n";
       //      echo "      value=\"10000\">\n";
       echo "      <INPUT NAME=\"attachfile\" TYPE=\"file\">\n";
-      echo "      &nbsp&nbsp<input type=\"submit\" name=\"attach\"\n";
+      echo "      &nbsp;&nbsp;<input type=\"submit\" name=\"attach\"\n";
       echo "      value=\"" . _("Add") ."\">\n";
-      echo "      <br>";
+      echo "     </td>\n";
+      echo "     </font>\n";
+      echo "   </tr>\n";
       if (isset($attachments) && count($attachments)>0) {
+         echo "</tr><tr><td width=50 bgcolor=\"$color[0]\" align=right>\n";
+         echo "&nbsp;";
+         echo "</td><td width=% 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";
          }
          
          echo "<input type=\"submit\" name=\"do_delete\" value=\""._("Delete selected attachments")."\">\n";
-
+         echo "</td></tr>";
       }
-      echo "     </td>\n";
-      echo "     </font>\n";
-      echo "   </tr>\n";
       // End of attachment code
 
-      echo "   <TR>\n";
-      echo "      <TD BGCOLOR=\"$color[4]\" COLSPAN=2>\n";
-      if ($use_signature == true)
-         echo "         &nbsp;&nbsp;<TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>$body\n\n$signature</TEXTAREA><BR>";
-      else
-         echo "         &nbsp;&nbsp;<TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>$body</TEXTAREA><BR>\n";
-      echo "      </TD>\n";
-      echo "   </TR>\n";
       echo "</TABLE>\n";
-      echo "<CENTER><INPUT TYPE=SUBMIT NAME=send VALUE=\"";
-      echo _("Send");
-      echo "\"></CENTER>";
       echo "</FORM>";
    }
 
@@ -285,30 +286,33 @@
       }
    } else if (isset($attach)) {
       $localfilename = md5("$attachfile, $attachfile_name, $REMOTE_IP, $REMOTE_PORT, $UNIQUE_ID, and everything else that may add entropy");
-      $localfilename = $data_dir.$localfilename;
+      $localfilename = $localfilename;
       
       // Put the file in a better place
       error_reporting(0); // Rename will produce error output if it fails
-      if (!rename($attachfile, $localfilename)) {
-         if (!copy($attachfile, $localfilename)) {
+      if (!rename($attachfile, $attachment_dir.$localfilename)) {
+         if (!copy($attachfile, $attachment_dir.$localfilename)) {
             plain_error_message(_("Could not move/copy file. File not attached"));
+            $failed = true;
          }
       }
       // If it still exists, PHP will remove the original file
 
-      // Write information about the file
-      $fp = fopen ($localfilename.".info", "w");
-      fputs ($fp, "$attachfile_type\n$attachfile_name\n");
-      fclose ($fp);
+      if (!$failed) {
+         // Write information about the file
+         $fp = fopen ($attachment_dir.$localfilename.".info", "w");
+         fputs ($fp, "$attachfile_type\n$attachfile_name\n");
+         fclose ($fp);
 
-      $attachments[$localfilename] = $attachfile_name;
+         $attachments[$localfilename] = $attachfile_name;
+      }
       
       showInputForm();
    } else if (isset($do_delete)) {
       while (list($key, $localname) = each($delete)) {
          array_splice ($attachments, $localname, 1);
-         unlink ($localname);
-         unlink ($localname.".info");
+         unlink ($attachment_dir.$localname);
+         unlink ($attachment_dir.$localname.".info");
       }
 
       showInputForm();