From 0344b168276f80189e2254c75a762aff5b517b6b Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 22 May 2016 06:32:57 -0400
Subject: [PATCH] Fix priority icon(s) position
---
program/steps/mail/headers.inc | 65 ++++++++++++++++++++------------
1 files changed, 41 insertions(+), 24 deletions(-)
diff --git a/program/steps/mail/headers.inc b/program/steps/mail/headers.inc
index 653fb96..17a471e 100644
--- a/program/steps/mail/headers.inc
+++ b/program/steps/mail/headers.inc
@@ -1,11 +1,15 @@
<?php
-/*
+
+/**
+-----------------------------------------------------------------------+
| program/steps/mail/headers.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland |
- | Licensed under the GNU GPL |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2016, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
| PURPOSE: |
| Fetch message headers in raw format for display |
@@ -13,27 +17,40 @@
+-----------------------------------------------------------------------+
| Author: Aleksander Machniak <alec@alec.pl> |
+-----------------------------------------------------------------------+
-
- $Id: mark.inc 1580 2008-06-30 09:36:18Z alec $
-
*/
-if ($uid = get_input_value('_uid', RCUBE_INPUT_POST))
-{
- $source = $IMAP->get_raw_headers($uid);
-
- if ($source)
- {
- $source = htmlspecialchars(trim($source));
- $source = preg_replace('/\t/', ' ', $source);
- $source = preg_replace('/^([a-z0-9_:-]+)/im', '<font class="bold">'.'\1'.'</font>', $source);
- $source = preg_replace('/\r?\n/', '<br />', $source);
-
- $OUTPUT->command('set_headers', $source);
- $OUTPUT->send();
+if ($uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST)) {
+ if ($pos = strpos($uid, '.')) {
+ $message = new rcube_message($uid);
+ $source = $message->get_part_body(substr($uid, $pos + 1));
+ $source = substr($source, 0, strpos($source, "\r\n\r\n"));
}
-}
-
-exit;
+ else {
+ $source = $RCMAIL->storage->get_raw_headers($uid);
+ }
-?>
+ if ($source !== false) {
+ $source = trim(rcube_charset::clean($source));
+ $source = htmlspecialchars($source);
+ $source = preg_replace(
+ array(
+ '/\n[\t\s]+/',
+ '/^([a-z0-9_:-]+)/im',
+ '/\r?\n/'
+ ),
+ array(
+ "\n ",
+ '<font class="bold">\1</font>',
+ '<br />'
+ ), $source);
+
+ $OUTPUT->command('set_headers', $source);
+ }
+ else {
+ $RCMAIL->output->show_message('messageopenerror', 'error');
+ }
+
+ $OUTPUT->send();
+}
+
+exit;
--
Gitblit v1.9.1