diff options
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/mail/compose.inc | 8 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 3 | ||||
| -rw-r--r-- | program/steps/mail/get.inc | 7 |
3 files changed, 8 insertions, 10 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 9ffde8a57..2330bc040 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -1450,17 +1450,17 @@ function rcmail_priority_selector($attrib) rcube_label('normal'), rcube_label('high'), rcube_label('highest')), - array(5, 4, 0, 2, 1)); + array('5', '4', '0', '2', '1')); if (isset($_POST['_priority'])) $sel = $_POST['_priority']; - else if (intval($MESSAGE->headers->priority) != 3) - $sel = intval($MESSAGE->headers->priority); + else if (isset($MESSAGE->headers->priority) && intval($MESSAGE->headers->priority) != 3) + $sel = $MESSAGE->headers->priority; else $sel = 0; $out = $form_start ? "$form_start\n" : ''; - $out .= $selector->show($sel); + $out .= $selector->show(strval($sel)); $out .= $form_end ? "\n$form_end" : ''; return $out; diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index ae23d4a6d..a41e3ffeb 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1783,9 +1783,8 @@ function rcmail_identity_select($MESSAGE, $identities = null, $compose_mode = 'r // Try Return-Path if ($from_idx === null && ($return_path = $MESSAGE->headers->others['return-path'])) { foreach ($identities as $idx => $ident) { - $ident = str_replace('@', '=', $ident['email_ascii']) . '@'; foreach ((array)$return_path as $path) { - if (strpos($path, $ident) !== false) { + if (stripos($path, $ident['email_ascii']) !== false) { $from_idx = $idx; break 2; } diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc index a27e788a3..3334caa8b 100644 --- a/program/steps/mail/get.inc +++ b/program/steps/mail/get.inc @@ -134,7 +134,7 @@ else if (strlen($part_id)) { $valid = $file_extension && in_array($file_extension, (array)$extensions) || !empty($_REQUEST['_mimeclass']); // 2. detect the real mimetype of the attachment part and compare it with the stated mimetype and filename extension - if ($valid || !$file_extension || $mimetype == 'application/octet-stream' || $mimetype == 'text/plain') { + if ($valid || !$file_extension || $mimetype == 'application/octet-stream' || stripos($mimetype, 'text/') === 0) { if ($part->body) // part body is already loaded $body = $part->body; else if ($part->size && $part->size < 1024*1024) // load the entire part if it's small enough @@ -189,8 +189,8 @@ else if (strlen($part_id)) { rcube_label(array( 'name' => 'attachmentvalidationerror', 'vars' => array( - 'expected' => $mimetype . ($file_extension ? "(.$file_extension)" : ''), - 'detected' => $real_mimetype . ($extensions[0] ? "(.$extensions[0])" : ''), + 'expected' => $mimetype . ($file_extension ? " (.$file_extension)" : ''), + 'detected' => $real_mimetype . ($extensions[0] ? " (.$extensions[0])" : ''), ) )) . html::p(array('class' => 'rcmail-inline-buttons'), @@ -233,7 +233,6 @@ else if (strlen($part_id)) { header("Content-Transfer-Encoding: binary"); } - // deliver part content if ($ctype_primary == 'text' && $ctype_secondary == 'html' && empty($plugin['download'])) { // Check if we have enough memory to handle the message in it |