From ee14bb40ca5b377c7a52d25de4fb64a998655bfd Mon Sep 17 00:00:00 2001 From: Pete Donnell Date: Thu, 9 Mar 2023 12:26:29 +0700 Subject: [PATCH] fix renamed core rcmail class methods add version info into composer.json copy image to elastic skin --- CHANGELOG | 6 +++++ composer.json | 35 +++++++++++++++--------------- keyboard_shortcuts.php | 14 +++++------- package.xml | 2 +- skins/elastic/images/keyboard.png | Bin 0 -> 4157 bytes 5 files changed, 31 insertions(+), 26 deletions(-) create mode 100644 skins/elastic/images/keyboard.png diff --git a/CHANGELOG b/CHANGELOG index 6f9d1f8..31e0675 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,12 @@ CHANGELOG keyboard_shortcuts ============================ +RELEASE 2.4.2 + +- fix bugs caused by obsolete core $rcmail class methods +- include version info in composer.json +- copy image file to elastic skin + RELEASE 2.4.1 - fix composer.json diff --git a/composer.json b/composer.json index 90914b1..d6907b9 100644 --- a/composer.json +++ b/composer.json @@ -1,19 +1,20 @@ { - "name":"cor/keyboard_shortcuts", - "description":"allows some functionality to be handled with the keyboard", - "license":"GPL-2.0", - "homepage":"https://github.com/corbosman/keyboard_shortcuts", - "type": "roundcube-plugin", - "authors": [ - { - "name": "Cor Bosman", - "email": "cor@roundcu.be", - "homepage": "http://underwa.ter.net", - "role": "Developer" - } - ], - "support": { - "email": "cor@roundcu.be", - "issues": "https://github.com/corbosman/keyboard_shortcuts/issues" - } + "name": "cor/keyboard_shortcuts", + "description": "allows some functionality to be handled with the keyboard", + "license": "GPL-2.0", + "homepage": "https://github.com/corbosman/keyboard_shortcuts", + "type": "roundcube-plugin", + "authors": [ + { + "name": "Cor Bosman", + "email": "cor@roundcu.be", + "homepage": "http://underwa.ter.net", + "role": "Developer" + } + ], + "support": { + "email": "cor@roundcu.be", + "issues": "https://github.com/corbosman/keyboard_shortcuts/issues" + }, + "version": "2.4.2" } diff --git a/keyboard_shortcuts.php b/keyboard_shortcuts.php index c220766..782981b 100644 --- a/keyboard_shortcuts.php +++ b/keyboard_shortcuts.php @@ -4,13 +4,12 @@ * * Enables some common tasks to be executed with keyboard shortcuts * - * @version 1.4 - 07.07.2010 + * @version 2.4.2 2023-03-09 * @author Patrik Kullman / Roland 'rosali' Liebl / Cor Bosman - * @licence GNU GPL + * @licence GNU General Public License, version 2 + * @link https://github.com/corbosman/keyboard_shortcuts * **/ - /** * - **/ /** * Shortcuts, list view: @@ -102,11 +101,10 @@ function html_output($p) { $c .= ""; if(!is_object($rcmail->imap)){ - $rcmail->imap_connect(); + $rcmail->storage_connect(); } - $threading_supported = $rcmail->imap->get_capability('thread=references') - || $rcmail->imap->get_capability('thread=orderedsubject') - || $rcmail->imap->get_capability('thread=refs'); + $threading_supported = $rcmail->config->get('message-threading'); + $threading_supported = !empty($threading_supported); if ($threading_supported) { $c .= "

".$this->gettext("threads")."

"; diff --git a/package.xml b/package.xml index aa39b0d..663309e 100644 --- a/package.xml +++ b/package.xml @@ -12,7 +12,7 @@ https://github.com/corbosman/keyboard_shortcuts - 2.0.2 + 2.4.2 GNU GPLv2 diff --git a/skins/elastic/images/keyboard.png b/skins/elastic/images/keyboard.png new file mode 100644 index 0000000000000000000000000000000000000000..5719b76b22bd1656bb8eb9c418cc1d4c43b018ce GIT binary patch literal 4157 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