banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* committed patch from #1484775

Browse Source
release-0.6
till 17 years ago
parent 7eaf7ad543
commit 5998438b08
1 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File

68
program/steps/mail/upload.inc
Unescape Escape View File

@ -36,50 +36,52 @@ if (!is_array($_SESSION['compose']['attachments']))
$response = ''; $response = '';
foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath) if (is_array($_FILES['_attachments']['tmp_name']))
{ {
$tmpfname = tempnam($temp_dir, 'rcmAttmnt'); foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath)
if (move_uploaded_file($filepath, $tmpfname))
{ {
$id = count($_SESSION['compose']['attachments']); $tmpfname = tempnam($temp_dir, 'rcmAttmnt');
$_SESSION['compose']['attachments'][] = array('name' => $_FILES['_attachments']['name'][$i], 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], 'mimetype' => $_FILES['_attachments']['type'][$i],
'path' => $tmpfname); 'path' => $tmpfname);
if (is_file($CONFIG['skin_path'] . '/images/icons/remove-attachment.png')) if (is_file($CONFIG['skin_path'] . '/images/icons/remove-attachment.png'))
$button = sprintf( $button = sprintf(
'<img src="%s/images/icons/remove-attachment.png" alt="%s" border="0" style="padding-right:2px;vertical-align:middle" />', '<img src="%s/images/icons/remove-attachment.png" alt="%s" border="0" style="padding-right:2px;vertical-align:middle" />',
$CONFIG['skin_path'], $CONFIG['skin_path'],
Q(rcube_label('delete'))); Q(rcube_label('delete')));
else else
$button = Q(rcube_label('delete')); $button = Q(rcube_label('delete'));
$content = sprintf( $content = sprintf(
'<a href="#delete" onclick="return %s.command(\'remove-attachment\', \'rcmfile%d\', this)" title="%s">%s</a>%s', '<a href="#delete" onclick="return %s.command(\'remove-attachment\', \'rcmfile%d\', this)" title="%s">%s</a>%s',
JS_OBJECT_NAME, JS_OBJECT_NAME,
$id, $id,
Q(rcube_label('delete')), Q(rcube_label('delete')),
$button, $button,
Q($_FILES['_attachments']['name'][$i])); Q($_FILES['_attachments']['name'][$i]));
$OUTPUT->command('add2attachment_list', "rcmfile$id", $content); $OUTPUT->command('add2attachment_list', "rcmfile$id", $content);
} }
else // upload failed else // upload failed
{ {
$err = $_FILES['_attachments']['error'][$i]; $err = $_FILES['_attachments']['error'][$i];
if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE)
$msg = rcube_label(array('name' => 'filesizeerror', 'vars' => array('size' => show_bytes(parse_bytes(ini_get('upload_max_filesize')))))); $msg = rcube_label(array('name' => 'filesizeerror', 'vars' => array('size' => show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
else else
$msg = rcube_label('fileuploaderror'); $msg = rcube_label('fileuploaderror');
$OUTPUT->command('display_message', $msg, 'error'); $OUTPUT->command('display_message', $msg, 'error');
}
} }
} }
// send html page with JS calls as response // send html page with JS calls as response
$OUTPUT->command('show_attachment_form', false); $OUTPUT->command('show_attachment_form', false);
$OUTPUT->command('auto_save_start', false); $OUTPUT->command('auto_save_start', false);
$OUTPUT->send('iframe'); $OUTPUT->send('iframe');
?> ?>
Write Preview
Loading…
Cancel
Save