Index: index.php =================================================================== --- index.php (revision 39cd51aff59d8a85321474ee573b09b507b3f24e) +++ index.php (revision 133bb07f78b9486f0a524390253f08a0b446c584) @@ -177,6 +177,7 @@ 'expunge' => 'folders.inc', 'purge' => 'folders.inc', - 'remove-attachment' => 'compose.inc', - 'display-attachment' => 'compose.inc', + 'remove-attachment' => 'attachments.inc', + 'display-attachment' => 'attachments.inc', + 'upload' => 'attachments.inc', ), Index: program/steps/mail/attachments.inc =================================================================== --- program/steps/mail/attachments.inc (revision 133bb07f78b9486f0a524390253f08a0b446c584) +++ program/steps/mail/attachments.inc (revision 133bb07f78b9486f0a524390253f08a0b446c584) @@ -0,0 +1,127 @@ + | + +-----------------------------------------------------------------------+ + + $Id: compose.inc 2081 2008-11-23 12:38:44Z thomasb $ + +*/ + + +if (!$_SESSION['compose']) { + die("Invalid session var!"); +} + + +// remove an attachment +if ($RCMAIL->action=='remove-attachment') +{ + if (preg_match('/^rcmfile([0-9]+)$/', $_POST['_file'], $regs)) + { + $id = $regs[1]; + if (is_array($_SESSION['compose']['attachments'][$id])) + { + @unlink($_SESSION['compose']['attachments'][$id]['path']); + unset($_SESSION['compose']['attachments'][$id]); + $OUTPUT->command('remove_from_attachment_list', "rcmfile$id"); + $OUTPUT->send(); + } + } + exit; +} + +if ($RCMAIL->action=='display-attachment') +{ + if (preg_match('/^rcmfile([0-9]+)$/', $_GET['_file'], $regs)) + { + $id = $regs[1]; + if (is_array($_SESSION['compose']['attachments'][$id])) + { + $apath = $_SESSION['compose']['attachments'][$id]['path']; + header('Content-Type: ' . $_SESSION['compose']['attachments'][$id]['mimetype']); + header('Content-Length: ' . filesize($apath)); + readfile($apath); + } + } + exit; +} + +// attachment upload action + +// use common temp dir for file uploads +$temp_dir = unslashify($CONFIG['temp_dir']); + +if (!is_array($_SESSION['compose']['attachments'])) { + $_SESSION['compose']['attachments'] = array(); +} + +// clear all stored output properties (like scripts and env vars) +$OUTPUT->reset(); + +if (is_array($_FILES['_attachments']['tmp_name'])) { + foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath) { + $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' => rc_mime_content_type($tmpfname, $_FILES['_attachments']['type'][$i]), + 'path' => $tmpfname, + ); + + if (is_file($icon = $CONFIG['skin_path'] . '/images/icons/remove-attachment.png')) { + $button = html::img(array( + 'src' => $icon, + 'alt' => rcube_label('delete'), + 'style' => "padding-right:2px;vertical-align:middle", + )); + } + else { + $button = Q(rcube_label('delete')); + } + + $content = html::a(array( + 'href' => "#delete", + 'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%d', this)", JS_OBJECT_NAME, $id), + 'title' => rcube_label('delete'), + ), $button); + + $content .= Q($_FILES['_attachments']['name'][$i]); + + $OUTPUT->command('add2attachment_list', "rcmfile$id", $content); + } + else { // upload failed + $err = $_FILES['_attachments']['error'][$i]; + 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')))))); + } + else { + $msg = rcube_label('fileuploaderror'); + } + + $OUTPUT->command('display_message', $msg, 'error'); + } + } +} +else if ($_SERVER['REQUEST_METHOD'] == 'POST') { + $OUTPUT->command('display_message', rcube_label('fileuploaderror'), 'error'); +} + +// send html page with JS calls as response +$OUTPUT->command('show_attachment_form', false); +$OUTPUT->command('auto_save_start', false); +$OUTPUT->send('iframe'); + +?> Index: program/steps/mail/compose.inc =================================================================== --- program/steps/mail/compose.inc (revision 2c8e84c1e59e0f45bab6fd7671949642bdb8a31d) +++ program/steps/mail/compose.inc (revision 133bb07f78b9486f0a524390253f08a0b446c584) @@ -24,32 +24,4 @@ define('RCUBE_COMPOSE_FORWARD', 0x0107); define('RCUBE_COMPOSE_DRAFT', 0x0108); - - -// remove an attachment -if ($RCMAIL->action=='remove-attachment' && preg_match('/^rcmfile([0-9]+)$/', $_POST['_file'], $regs)) -{ - $id = $regs[1]; - if (is_array($_SESSION['compose']['attachments'][$id])) - { - @unlink($_SESSION['compose']['attachments'][$id]['path']); - unset($_SESSION['compose']['attachments'][$id]); - $OUTPUT->command('remove_from_attachment_list', "rcmfile$id"); - $OUTPUT->send(); - } - exit; -} - -if ($RCMAIL->action=='display-attachment' && preg_match('/^rcmfile([0-9]+)$/', $_GET['_file'], $regs)) -{ - $id = $regs[1]; - if (is_array($_SESSION['compose']['attachments'][$id])) - { - $apath = $_SESSION['compose']['attachments'][$id]['path']; - header('Content-Type: ' . $_SESSION['compose']['attachments'][$id]['mimetype']); - header('Content-Length: ' . filesize($apath)); - readfile($apath); - } - exit; -} $MESSAGE_FORM = NULL; Index: program/steps/mail/func.inc =================================================================== --- program/steps/mail/func.inc (revision 39cd51aff59d8a85321474ee573b09b507b3f24e) +++ program/steps/mail/func.inc (revision 133bb07f78b9486f0a524390253f08a0b446c584) @@ -26,5 +26,5 @@ // actions that do not require imap connection -$NOIMAP_ACTIONS = array('spell', 'addcontact', 'autocomplete', 'upload'); +$NOIMAP_ACTIONS = array('spell', 'addcontact', 'autocomplete', 'upload', 'display-attachment', 'remove-attachment'); @@ -39,5 +39,4 @@ $OUTPUT->send('login'); } - Index: ogram/steps/mail/upload.inc =================================================================== --- program/steps/mail/upload.inc (revision 70087c52bc89879b8b42c422392aecf3976bbb08) +++ (revision ) @@ -1,93 +1,0 @@ - | - +-----------------------------------------------------------------------+ - - $Id$ - -*/ - - -if (!$_SESSION['compose']) { - die("Invalid session var!"); -} - - -// use common temp dir for file uploads -$temp_dir = unslashify($CONFIG['temp_dir']); - - -if (!is_array($_SESSION['compose']['attachments'])) { - $_SESSION['compose']['attachments'] = array(); -} - -// clear all stored output properties (like scripts and env vars) -$OUTPUT->reset(); - -if (is_array($_FILES['_attachments']['tmp_name'])) { - foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath) { - $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' => rc_mime_content_type($tmpfname, $_FILES['_attachments']['type'][$i]), - 'path' => $tmpfname, - ); - - if (is_file($icon = $CONFIG['skin_path'] . '/images/icons/remove-attachment.png')) { - $button = html::img(array( - 'src' => $icon, - 'alt' => rcube_label('delete'), - 'style' => "padding-right:2px;vertical-align:middle", - )); - } - else { - $button = Q(rcube_label('delete')); - } - - $content = html::a(array( - 'href' => "#delete", - 'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%d', this)", JS_OBJECT_NAME, $id), - 'title' => rcube_label('delete'), - ), $button); - - $content .= Q($_FILES['_attachments']['name'][$i]); - - $OUTPUT->command('add2attachment_list', "rcmfile$id", $content); - } - else { // upload failed - $err = $_FILES['_attachments']['error'][$i]; - 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')))))); - } - else { - $msg = rcube_label('fileuploaderror'); - } - - $OUTPUT->command('display_message', $msg, 'error'); - } - } -} -else if ($_SERVER['REQUEST_METHOD'] == 'POST') { - $OUTPUT->command('display_message', rcube_label('fileuploaderror'), 'error'); -} - -// send html page with JS calls as response -$OUTPUT->command('show_attachment_form', false); -$OUTPUT->command('auto_save_start', false); -$OUTPUT->send('iframe'); - -?>