Since we're requiring PHP >= 4.0.4, we can just use move_upload_file

because it was added in 4.0.3.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4414 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/compose.php b/src/compose.php
index 33332825eba0159ba09281e2f1ac6b8051a0c579..fd7e07cc1ea25c3290a70cd5dd10ef8f010891ff 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -1176,17 +1176,10 @@ function saveAttachedFiles($session) {
         $full_localfilename = "$hashed_attachment_dir/$localfilename";
     }
 
         $full_localfilename = "$hashed_attachment_dir/$localfilename";
     }
 

-    if (!@rename($_FILES['attachfile']['tmp_name'], $full_localfilename)) {
-       if (function_exists("move_uploaded_file")) {
-            if (!@move_uploaded_file($_FILES['attachfile']['tmp_name'],$full_localfilename)) {
-               return true;
-           }
-       } else {
-           if (!@copy($_FILES['attachfile']['tmp_name'], $full_localfilename)) {
-                return true;
-            }
-       }
+    if (!@move_uploaded_file($_FILES['attachfile']['tmp_name'],$full_localfilename)) {
+        return true;

     }
     }

+

     $message = $compose_messages[$session];
     $type = strtolower($_FILES['attachfile']['type']);
     $name = $_FILES['attachfile']['name'];
     $message = $compose_messages[$session];
     $type = strtolower($_FILES['attachfile']['type']);
     $name = $_FILES['attachfile']['name'];