From 6204390af16bcf50f82da61a1aefc2ad0c0adf94 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 01 May 2006 10:47:27 -0400
Subject: [PATCH] Applied patch for requesting receipts by Salvatore Ansani
---
program/steps/mail/upload.inc | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/program/steps/mail/upload.inc b/program/steps/mail/upload.inc
index 3ae88fa..4cd929d 100644
--- a/program/steps/mail/upload.inc
+++ b/program/steps/mail/upload.inc
@@ -26,20 +26,12 @@
}
-if (strlen($CONFIG['temp_dir']))
- $temp_dir = $CONFIG['temp_dir'].(!eregi('\/$', $CONFIG['temp_dir']) ? '/' : '').$_SESSION['compose']['id'];
+// create temp dir for file uploads
+$temp_dir = rcmail_create_compose_tempdir();
+
if (!is_array($_SESSION['compose']['attachments']))
- {
$_SESSION['compose']['attachments'] = array();
-
- // create temp-dir for uploaded attachments
- if ($CONFIG['temp_dir'] && is_writeable($CONFIG['temp_dir']))
- {
- mkdir($temp_dir);
- $_SESSION['compose']['temp_dir'] = $temp_dir;
- }
- }
$response = '';
@@ -47,7 +39,7 @@
foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath)
{
$tmpfname = tempnam($temp_dir, 'rcmAttmnt');
- if (copy($filepath, $tmpfname))
+ if (move_uploaded_file($filepath, $tmpfname))
{
$_SESSION['compose']['attachments'][] = array('name' => $_FILES['_attachments']['name'][$i],
'mimetype' => $_FILES['_attachments']['type'][$i],
--
Gitblit v1.9.1