summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--program/include/rcube_shared.inc31
-rw-r--r--program/steps/mail/compose.inc5
-rw-r--r--program/steps/mail/sendmail.inc7
-rw-r--r--program/steps/mail/upload.inc73
4 files changed, 57 insertions, 59 deletions
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index 4cab27096..000483ef8 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -556,31 +556,26 @@ function get_offset_time($offset_str, $factor=1)
*/
function rc_mime_content_type($path, $failover = 'unknown/unknown')
{
- global $CONFIG;
+ $mime_type = null;
+ $mime_magic = rcmail::get_instance()->config->get('mime_magic');
- $mime_magic = $CONFIG['mime_magic'];
-
- if (function_exists('mime_content_type')) {
- $finfo = mime_content_type($path);
- if ($finfo)
- return $finfo;
+ if (!extension_loaded('fileinfo')) {
+ @dl('fileinfo.' . PHP_SHLIB_SUFFIX);
}
-
- if (!extension_loaded('fileinfo')) {
- if (!dl('fileinfo.' . PHP_SHLIB_SUFFIX)) {
- return $failover;
+
+ if (function_exists('finfo_open')) {
+ if ($finfo = finfo_open(FILEINFO_MIME, $mime_magic)) {
+ $mime_type = finfo_file($finfo, $path);
+ finfo_close($finfo);
}
}
-
- $finfo = finfo_open(FILEINFO_MIME, $mime_magic);
- if (!$finfo) {
- return $failover;
+ else if (function_exists('mime_content_type')) {
+ $mime_type = mime_content_type($path);
}
- $mime_type = finfo_file($finfo,$path);
+
if (!$mime_type) {
- return $failover;
+ $mime_type = $failover;
}
- finfo_close($finfo);
return $mime_type;
}
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 1b1d0bf4b..9da449d54 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -645,12 +645,17 @@ function rcmail_compose_attachment_list($attrib)
$button = Q(rcube_label('delete'));
foreach ($_SESSION['compose']['attachments'] as $id => $a_prop)
+ {
+ if (empty($a_prop))
+ continue;
+
$out .= html::tag('li', array('id' => "rcmfile".$id),
html::a(array(
'href' => "#delete",
'title' => rcube_label('delete'),
'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%d', this)", JS_OBJECT_NAME, $id)),
$button) . Q($a_prop['name']));
+ }
}
$OUTPUT->add_gui_object('attachmentlist', $attrib['id']);
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index babde48b9..75000d4aa 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -284,12 +284,7 @@ if (is_array($_SESSION['compose']['attachments']))
}
else
{
- /*
- We need to replace mime_content_type in a later release because the function
- is deprecated in favour of File_Info
- */
- $ctype = rc_mime_content_type($attachment['path'], $attachment['mimetype']);
- $ctype = str_replace('image/pjpeg', 'image/jpeg', $ctype); // #1484914
+ $ctype = str_replace('image/pjpeg', 'image/jpeg', $attachment['mimetype']); // #1484914
// .eml attachments send inline
$MAIL_MIME->addAttachment($attachment['path'],
diff --git a/program/steps/mail/upload.inc b/program/steps/mail/upload.inc
index cb589ba52..a519ddbe6 100644
--- a/program/steps/mail/upload.inc
+++ b/program/steps/mail/upload.inc
@@ -29,59 +29,62 @@ if (!$_SESSION['compose']) {
$temp_dir = unslashify($CONFIG['temp_dir']);
-if (!is_array($_SESSION['compose']['attachments']))
+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)
- {
+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))
- {
+ 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);
-
- 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'],
- Q(rcube_label('delete')));
- else
+ $_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,
+ 'border' => 0,
+ 'alt' => rcube_label('delete'),
+ 'style' => "padding-right:2px;vertical-align:middle",
+ ));
+ }
+ else {
$button = Q(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,
- Q(rcube_label('delete')),
- $button,
- Q($_FILES['_attachments']['name'][$i]));
-
+ $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
- {
+ }
+ else { // upload failed
$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'))))));
- else
+ }
+ else {
$msg = rcube_label('fileuploaderror');
+ }
$OUTPUT->command('display_message', $msg, 'error');
- }
}
}
-else if ($_SERVER['REQUEST_METHOD'] == 'POST')
- {
+}
+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);
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-30 22:05:44 +0000