From b6da0b76afb5697685c35b8584631294cfc7b12f Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 07 Dec 2011 05:41:15 -0500
Subject: [PATCH] - Remove deprecated global $IMAP variable usage (#1488148)
---
program/steps/mail/headers.inc | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/program/steps/mail/headers.inc b/program/steps/mail/headers.inc
index 653fb96..5eee4bd 100644
--- a/program/steps/mail/headers.inc
+++ b/program/steps/mail/headers.inc
@@ -3,8 +3,8 @@
+-----------------------------------------------------------------------+
| program/steps/mail/headers.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2007, The Roundcube Dev Team |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -14,26 +14,37 @@
| Author: Aleksander Machniak <alec@alec.pl> |
+-----------------------------------------------------------------------+
- $Id: mark.inc 1580 2008-06-30 09:36:18Z alec $
+ $Id$
*/
if ($uid = get_input_value('_uid', RCUBE_INPUT_POST))
{
- $source = $IMAP->get_raw_headers($uid);
+ $source = $RCMAIL->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 ($source !== false) {
+ $source = htmlspecialchars(trim($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