From aade7b98044ad4abb9021452688ec3af57f36acb Mon Sep 17 00:00:00 2001 From: thomascube <thomas@roundcube.net> Date: Sun, 06 Aug 2006 11:55:11 -0400 Subject: [PATCH] Finalized 0.1beta2 release --- program/steps/mail/upload.inc | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/program/steps/mail/upload.inc b/program/steps/mail/upload.inc index abab389..850ccd0 100644 --- a/program/steps/mail/upload.inc +++ b/program/steps/mail/upload.inc @@ -41,13 +41,29 @@ $tmpfname = tempnam($temp_dir, 'rcmAttmnt'); 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); - $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')); - $content = sprintf('<a href="#" onclick="%s.command(\\\'remove-attachment\\\',\\\'%s\\\')" title="%s">%s</a>%s',$JS_OBJECT_NAME, $_FILES['_attachments']['name'][$i], rcube_label('delete'), $button, $_FILES['_attachments']['name'][$i]); - $response .= sprintf('parent.%s.add2attachment_list(\'%s\',\'%s\');',$JS_OBJECT_NAME, $_FILES['_attachments']['name'][$i], $content); + 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); } } -- Gitblit v1.9.1