From 3412e50b54e3daac8745234e21ab6e72be0ed165 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 04 Jun 2014 11:20:33 -0400
Subject: [PATCH] Fix attachment menu structure and aria-attributes
---
plugins/show_additional_headers/show_additional_headers.php | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/plugins/show_additional_headers/show_additional_headers.php b/plugins/show_additional_headers/show_additional_headers.php
index 7e7c503..b7f0110 100644
--- a/plugins/show_additional_headers/show_additional_headers.php
+++ b/plugins/show_additional_headers/show_additional_headers.php
@@ -6,33 +6,33 @@
* Proof-of-concept plugin which will fetch additional headers
* and display them in the message view.
*
- * Enable the plugin in config/main.inc.php and add your desired headers:
- * $rcmail_config['show_additional_headers'] = array('User-Agent');
+ * Enable the plugin in config.inc.php and add your desired headers:
+ * $config['show_additional_headers'] = array('User-Agent');
*
- * @version 1.0
+ * @version @package_version@
* @author Thomas Bruederli
- * @website http://roundcube.net
+ * @license GNU GPLv3+
*/
class show_additional_headers extends rcube_plugin
{
public $task = 'mail';
-
+
function init()
{
$rcmail = rcmail::get_instance();
if ($rcmail->action == 'show' || $rcmail->action == 'preview') {
- $this->add_hook('imap_init', array($this, 'imap_init'));
+ $this->add_hook('storage_init', array($this, 'storage_init'));
$this->add_hook('message_headers_output', array($this, 'message_headers'));
} else if ($rcmail->action == '') {
// with enabled_caching we're fetching additional headers before show/preview
- $this->add_hook('imap_init', array($this, 'imap_init'));
+ $this->add_hook('storage_init', array($this, 'storage_init'));
}
}
-
- function imap_init($p)
+
+ function storage_init($p)
{
$rcmail = rcmail::get_instance();
- if ($add_headers = $rcmail->config->get('show_additional_headers', array()))
+ if ($add_headers = (array)$rcmail->config->get('show_additional_headers', array()))
$p['fetch_headers'] = trim($p['fetch_headers'].' ' . strtoupper(join(' ', $add_headers)));
return $p;
@@ -41,10 +41,9 @@
function message_headers($p)
{
$rcmail = rcmail::get_instance();
- foreach ($rcmail->config->get('show_additional_headers', array()) as $header) {
- $key = strtolower($header);
- if ($value = $p['headers']->others[$key])
- $p['output'][$key] = array('title' => $header, 'value' => $value);
+ foreach ((array)$rcmail->config->get('show_additional_headers', array()) as $header) {
+ if ($value = $p['headers']->get($header))
+ $p['output'][$header] = array('title' => $header, 'value' => $value);
}
return $p;
--
Gitblit v1.9.1