Added new languages, hierarchical folder tree and attachments in forwarded messages

1 files changed, 3 insertions, 11 deletions

diff --git a/program/steps/mail/upload.inc b/program/steps/mail/upload.inc
index 3ae88fad6..308ec796e 100644
--- a/program/steps/mail/upload.inc
+++ b/program/steps/mail/upload.inc
@@ -26,21 +26,13 @@ if (!$_SESSION['compose'])
   }
 
 
-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 = '';