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

Prefer File_Info over mime_content_type + detect mime type when uploading + some code style

Browse Source
release-0.6
thomascube 17 years ago
parent 94e38bbc1e
commit 6d5dbae53c
4 changed files with 57 additions and 59 deletions
Show Stats Download Patch File Download Diff File

29
program/include/rcube_shared.inc
Unescape Escape View File

@ -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;
}

5
program/steps/mail/compose.inc
Unescape Escape View File

@ -645,6 +645,10 @@ 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",
@ -652,6 +656,7 @@ function rcmail_compose_attachment_list($attrib)
'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']);

7
program/steps/mail/sendmail.inc
Unescape Escape View File

@ -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'],

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

@ -29,57 +29,60 @@ 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');
}

Write Preview
Loading…
Cancel
Save