Changeset 2376 in subversion for trunk/roundcubemail/program/steps/mail/attachments.inc

Timestamp:

Apr 6, 2009 7:33:13 AM (4 years ago)

Author:

alec

Message:

• Fix 'temp_dir' does not support relative path under Windows (#1484529)
• add file_exists check for uploaded attachments

File:

• trunk/roundcubemail/program/steps/mail/attachments.inc (modified) (2 diffs)

trunk/roundcubemail/program/steps/mail/attachments.inc

@@ -64 +64 @@
 $temp_dir = unslashify($CONFIG['temp_dir']);
 
+// #1484529: we need absolute path on Windows for move_uploaded_file()
+if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+  $temp_dir = realpath($temp_dir);
+}
+
 if (!is_array($_SESSION['compose']['attachments'])) {
   $_SESSION['compose']['attachments'] = array();
@@ -74 +79 @@
   foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath) {
     $tmpfname = tempnam($temp_dir, 'rcmAttmnt');
-    if (move_uploaded_file($filepath, $tmpfname)) {
+    if (move_uploaded_file($filepath, $tmpfname) && file_exists($tmpfname)) {
       $id = count($_SESSION['compose']['attachments']);
       $_SESSION['compose']['attachments'][] = array(