From 77c28206a14b5bee3f3091f10cffd531bce5649c Mon Sep 17 00:00:00 2001
From: yllar <yllar.pajus@gmail.com>
Date: Sat, 16 Dec 2006 13:25:16 -0500
Subject: [PATCH] updated ja and fr translations

---
 program/steps/mail/upload.inc |   51 ++++++++++++++++++++++++++++-----------------------
 1 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/program/steps/mail/upload.inc b/program/steps/mail/upload.inc
index 3ae88fa..cde4ed2 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'];
+// use common temp dir for file uploads
+$temp_dir = unslashify($CONFIG['temp_dir']);
+
 
 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,29 +39,42 @@
 foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath)
   {
   $tmpfname = tempnam($temp_dir, 'rcmAttmnt');
-  if (copy($filepath, $tmpfname))
+  if (move_uploaded_file($filepath, $tmpfname))
     {
+    $id = count($_SESSION['compose']['attachments']);
     $_SESSION['compose']['attachments'][] = array('name' => $_FILES['_attachments']['name'][$i],
                                                   'mimetype' => $_FILES['_attachments']['type'][$i],
                                                   'path' => $tmpfname);
 
-    $response .= sprintf("parent.%s.add2attachment_list('%s');\n", $JS_OBJECT_NAME, $_FILES['_attachments']['name'][$i]);
+    if (is_file($CONFIG['skin_path'] . '/images/icons/remove-attachment.png'))
+      $button = sprintf('<img src="%s/images/icons/remove-attachment.png" alt="%s" border="0" style="padding-right:2px;vertical-align:middle" />',
+                        $CONFIG['skin_path'],
+                        rcube_label('delete'));
+    else
+      $button = rcube_label('delete');
+
+    $content = sprintf('<a href="#delete" onclick="return %s.command(\\\'remove-attachment\\\', \\\'rcmfile%d\\\', this)" title="%s">%s</a>%s',
+                       $JS_OBJECT_NAME,
+                       $id,
+                       rcube_label('delete'),
+                       $button,
+                       rep_specialchars_output($_FILES['_attachments']['name'][$i], 'js'));
+
+    $response .= sprintf('parent.%s.add2attachment_list(\'rcmfile%d\',\'%s\');',
+                         $JS_OBJECT_NAME,
+                         $id,
+                         $content);
     }
   }
 
 
 // send html page with JS calls as response
-print <<<EOF
-<html>
-<script type="text/javascript">
-if (parent.$JS_OBJECT_NAME)
-{
+$frameout = <<<EOF
 $response
 parent.$JS_OBJECT_NAME.show_attachment_form(false);
-}
-</script>
-</html>
+parent.$JS_OBJECT_NAME.auto_save_start();
 EOF;
-exit;
 
-?>
\ No newline at end of file
+rcube_iframe_response($frameout);
+
+?>

--
Gitblit v1.9.1