update to roundcubemail-1.5.1
This commit is contained in:
sthen
parent
bd2dc42836
commit
b2b37475d8
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.164 2021/11/16 16:11:39 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.165 2021/11/29 10:27:01 sthen Exp $
|
||||
|
||||
COMMENT= imap4 webmail client
|
||||
|
||||
V= 1.5.0
|
||||
REVISION= 1
|
||||
V= 1.5.1
|
||||
DISTNAME= roundcubemail-$V
|
||||
PKGNAME= roundcubemail-${V:S/-//}
|
||||
EXTRACT_SUFX= -complete.tar.gz
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (roundcubemail-1.5.0-complete.tar.gz) = L9x7FmPl6ZcGv/NAk6pHMdS/IqWMtVWiUg7RveeNASw=
|
||||
SIZE (roundcubemail-1.5.0-complete.tar.gz) = 7802014
|
||||
SHA256 (roundcubemail-1.5.1-complete.tar.gz) = YRsNgCJ9C3AonHFXh7LYX9Fe2RXrVtWFwQTCQ3YDboM=
|
||||
SIZE (roundcubemail-1.5.1-complete.tar.gz) = 7827081
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-UPGRADING,v 1.14 2021/10/19 07:55:12 sthen Exp $
|
||||
$OpenBSD: patch-UPGRADING,v 1.15 2021/11/29 10:27:01 sthen Exp $
|
||||
|
||||
Index: UPGRADING
|
||||
--- UPGRADING.orig
|
||||
+++ UPGRADING
|
||||
@@ -48,14 +48,13 @@ it on a unix system, you need to do the following oper
|
||||
@@ -49,14 +49,13 @@ it on a unix system, you need to do the following oper
|
||||
./vendor/
|
||||
4. Update dependencies:
|
||||
4a. If you previously installed plugins through composer, update dependencies
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
$OpenBSD: patch-program_actions_mail_index_php,v 1.1 2021/10/29 14:00:00 sthen Exp $
|
||||
|
||||
From e62ac0c85ddaed73191745178457b8c3befad457 Mon Sep 17 00:00:00 2001
|
||||
From: Aleksander Machniak <alec@alec.pl>
|
||||
Date: Tue, 19 Oct 2021 19:21:40 +0200
|
||||
Subject: [PATCH] Fix so session's search scope is not used if search is not
|
||||
active (#8199)
|
||||
|
||||
From fdca2a55edb83d65119b60044eb6b611ed6a015b Mon Sep 17 00:00:00 2001
|
||||
From: Aleksander Machniak <alec@alec.pl>
|
||||
Date: Fri, 29 Oct 2021 12:48:07 +0200
|
||||
Subject: [PATCH] Fix bug with show_images setting where option 1 and 3 were
|
||||
swapped (#8268)
|
||||
|
||||
Index: program/actions/mail/index.php
|
||||
--- program/actions/mail/index.php.orig
|
||||
+++ program/actions/mail/index.php
|
||||
@@ -98,8 +98,8 @@ class rcmail_action_mail_index extends rcmail_action
|
||||
if (empty($rcmail->action)) {
|
||||
$rcmail->output->set_env('search_mods', self::search_mods());
|
||||
|
||||
- $scope = rcube_utils::get_input_value('_scope', rcube_utils::INPUT_GET);
|
||||
- if (!$scope && isset($_SESSION['search_scope'])) {
|
||||
+ $scope = rcube_utils::get_input_string('_scope', rcube_utils::INPUT_GET);
|
||||
+ if (!$scope && isset($_SESSION['search_scope']) && $rcmail->output->get_env('search_request')) {
|
||||
$scope = $_SESSION['search_scope'];
|
||||
}
|
||||
|
||||
@@ -862,12 +862,12 @@ class rcmail_action_mail_index extends rcmail_action
|
||||
&& $message->has_html_part()
|
||||
) {
|
||||
switch ($show_images) {
|
||||
- case 1: // trusted senders only
|
||||
- case 3: // all my contacts
|
||||
+ case 3: // trusted senders only
|
||||
+ case 1: // all my contacts
|
||||
if (!empty($message->sender['mailto'])) {
|
||||
$type = rcube_addressbook::TYPE_TRUSTED_SENDER;
|
||||
|
||||
- if ($show_images == 3) {
|
||||
+ if ($show_images == 1) {
|
||||
$type |= rcube_addressbook::TYPE_RECIPIENT | rcube_addressbook::TYPE_WRITEABLE;
|
||||
}
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
$OpenBSD: patch-program_actions_mail_send_php,v 1.1 2021/10/29 14:00:00 sthen Exp $
|
||||
|
||||
From d73d81032f12bafa691b8f74c50b9bd7caf75606 Mon Sep 17 00:00:00 2001
|
||||
From: Aleksander Machniak <alec@alec.pl>
|
||||
Date: Thu, 21 Oct 2021 19:52:04 +0200
|
||||
Subject: [PATCH] Fix some PHP8 warnings (#8239)
|
||||
|
||||
Index: program/actions/mail/send.php
|
||||
--- program/actions/mail/send.php.orig
|
||||
+++ program/actions/mail/send.php
|
||||
@@ -400,13 +400,13 @@ class rcmail_action_mail_send extends rcmail_action
|
||||
}
|
||||
else {
|
||||
$ctype = str_replace('image/pjpeg', 'image/jpeg', $attachment['mimetype']); // #1484914
|
||||
- $file = $attachment['data'] ?: $attachment['path'];
|
||||
+ $file = !empty($attachment['data']) ? $attachment['data'] : $attachment['path'];
|
||||
$folding = (int) $rcmail->config->get('mime_param_folding');
|
||||
|
||||
$message->addAttachment($file,
|
||||
$ctype,
|
||||
$attachment['name'],
|
||||
- $attachment['data'] ? false : true,
|
||||
+ !empty($attachment['data']) ? false : true,
|
||||
$ctype == 'message/rfc822' ? '8bit' : 'base64',
|
||||
'attachment',
|
||||
isset($attachment['charset']) ? $attachment['charset'] : null,
|
||||
@ -1,29 +0,0 @@
|
||||
$OpenBSD: patch-program_actions_mail_show_php,v 1.1 2021/10/29 14:00:00 sthen Exp $
|
||||
|
||||
From d203db0366df8fb438e6433cc31926019a32881f Mon Sep 17 00:00:00 2001
|
||||
From: Aleksander Machniak <alec@alec.pl>
|
||||
Date: Thu, 28 Oct 2021 14:39:34 +0200
|
||||
Subject: [PATCH] Fix bug where adding a contact to trusted senders via "Always
|
||||
allow from..." button didn't work (#8264, #8268)
|
||||
|
||||
From fdca2a55edb83d65119b60044eb6b611ed6a015b Mon Sep 17 00:00:00 2001
|
||||
From: Aleksander Machniak <alec@alec.pl>
|
||||
Date: Fri, 29 Oct 2021 12:48:07 +0200
|
||||
Subject: [PATCH] Fix bug with show_images setting where option 1 and 3 were
|
||||
swapped (#8268)
|
||||
|
||||
Index: program/actions/mail/show.php
|
||||
--- program/actions/mail/show.php.orig
|
||||
+++ program/actions/mail/show.php
|
||||
@@ -263,9 +263,10 @@ class rcmail_action_mail_show extends rcmail_action_ma
|
||||
// add link to save sender in addressbook and reload message
|
||||
$show_images = $rcmail->config->get('show_images');
|
||||
if (!empty(self::$MESSAGE->sender['mailto']) && ($show_images == 1 || $show_images == 3)) {
|
||||
+ $arg = $show_images == 3 ? rcube_addressbook::TYPE_TRUSTED_SENDER : 'true';
|
||||
$buttons .= ' ' . html::a([
|
||||
'href' => "#loadremotealways",
|
||||
- 'onclick' => rcmail_output::JS_OBJECT_NAME . ".command('load-remote', true)",
|
||||
+ 'onclick' => rcmail_output::JS_OBJECT_NAME . ".command('load-remote', $arg)",
|
||||
'style' => "white-space:nowrap"
|
||||
],
|
||||
rcube::Q($rcmail->gettext(['name' => 'alwaysallow', 'vars' => ['sender' => self::$MESSAGE->sender['mailto']]]))
|
||||
@ -1,22 +0,0 @@
|
||||
$OpenBSD: patch-program_actions_settings_index_php,v 1.1 2021/10/29 14:00:00 sthen Exp $
|
||||
|
||||
From fdca2a55edb83d65119b60044eb6b611ed6a015b Mon Sep 17 00:00:00 2001
|
||||
From: Aleksander Machniak <alec@alec.pl>
|
||||
Date: Fri, 29 Oct 2021 12:48:07 +0200
|
||||
Subject: [PATCH] Fix bug with show_images setting where option 1 and 3 were
|
||||
swapped (#8268)
|
||||
|
||||
Index: program/actions/settings/index.php
|
||||
--- program/actions/settings/index.php.orig
|
||||
+++ program/actions/settings/index.php
|
||||
@@ -612,8 +612,8 @@ class rcmail_action_settings_index extends rcmail_acti
|
||||
]);
|
||||
|
||||
$input->add($rcmail->gettext('never'), 0);
|
||||
- $input->add($rcmail->gettext('frommycontacts'), 3);
|
||||
- $input->add($rcmail->gettext('fromtrustedsenders'), 1);
|
||||
+ $input->add($rcmail->gettext('frommycontacts'), 1);
|
||||
+ $input->add($rcmail->gettext('fromtrustedsenders'), 3);
|
||||
$input->add($rcmail->gettext('always'), 2);
|
||||
|
||||
$blocks['main']['options']['show_images'] = [
|
||||
@ -1,24 +0,0 @@
|
||||
$OpenBSD: patch-program_include_rcmail_attachment_handler_php,v 1.1 2021/10/29 14:00:00 sthen Exp $
|
||||
|
||||
From d73d81032f12bafa691b8f74c50b9bd7caf75606 Mon Sep 17 00:00:00 2001
|
||||
From: Aleksander Machniak <alec@alec.pl>
|
||||
Date: Thu, 21 Oct 2021 19:52:04 +0200
|
||||
Subject: [PATCH] Fix some PHP8 warnings (#8239)
|
||||
|
||||
Index: program/include/rcmail_attachment_handler.php
|
||||
--- program/include/rcmail_attachment_handler.php.orig
|
||||
+++ program/include/rcmail_attachment_handler.php
|
||||
@@ -229,8 +229,11 @@ class rcmail_attachment_handler
|
||||
}
|
||||
}
|
||||
else {
|
||||
- $data = $attachment['data'];
|
||||
- if (!$data && $attachment['path']) {
|
||||
+ $data = null;
|
||||
+ if (!empty($attachment['data'])) {
|
||||
+ $data = $attachment['data'];
|
||||
+ }
|
||||
+ else if (!empty($attachment['path'])) {
|
||||
$data = file_get_contents($attachment['path']);
|
||||
}
|
||||
|
||||
@ -1,61 +0,0 @@
|
||||
$OpenBSD: patch-program_js_app_js,v 1.3 2021/10/29 14:00:00 sthen Exp $
|
||||
|
||||
From d203db0366df8fb438e6433cc31926019a32881f Mon Sep 17 00:00:00 2001
|
||||
From: Aleksander Machniak <alec@alec.pl>
|
||||
Date: Thu, 28 Oct 2021 14:39:34 +0200
|
||||
Subject: [PATCH] Fix bug where adding a contact to trusted senders via "Always
|
||||
allow from..." button didn't work (#8264, #8268)
|
||||
|
||||
From f4ee8c44c2e613c5cb457a1ddb45d1b24fdb37b7 Mon Sep 17 00:00:00 2001
|
||||
From: Aleksander Machniak <alec@alec.pl>
|
||||
Date: Thu, 28 Oct 2021 13:01:05 +0200
|
||||
Subject: [PATCH] Fix bug where \u200b characters were added into the recipient
|
||||
input preventing mail delivery (#8269)
|
||||
|
||||
Index: program/js/app.js
|
||||
--- program/js/app.js.orig
|
||||
+++ program/js/app.js
|
||||
@@ -1095,7 +1095,7 @@ function rcube_webmail()
|
||||
case 'load-remote':
|
||||
if (this.env.uid) {
|
||||
if (props && this.env.sender) {
|
||||
- this.add_contact(this.env.sender, true);
|
||||
+ this.add_contact(this.env.sender, true, props);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -4880,16 +4880,18 @@ function rcube_webmail()
|
||||
var data, name, n, id;
|
||||
for (n = 0; n < selection.length; n++) {
|
||||
if ((id = selection[n]) && (data = this.env.contactdata[id])) {
|
||||
- // We wrap the group name with invisible markers to prevent from problems with group expanding (#7569)
|
||||
- name = '\u200b' + (data.name || data) + '\u200b';
|
||||
- recipients.push(name);
|
||||
+ name = data.name || data
|
||||
|
||||
// group is added, expand it
|
||||
if (id.charAt(0) == 'E' && input.length) {
|
||||
+ // We wrap the group name with invisible markers to prevent from problems with group expanding (#7569)
|
||||
+ name = '\u200b' + name + '\u200b';
|
||||
var gid = id.substr(1);
|
||||
this.group2expand[gid] = {name: name, input: input.get(0)};
|
||||
this.http_request('group-expand', {_source: data.source || this.env.source, _gid: gid}, false);
|
||||
}
|
||||
+
|
||||
+ recipients.push(name);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5610,10 +5612,10 @@ function rcube_webmail()
|
||||
};
|
||||
|
||||
// send remote request to add a new contact
|
||||
- this.add_contact = function(value, reload)
|
||||
+ this.add_contact = function(value, reload, source)
|
||||
{
|
||||
if (value)
|
||||
- this.http_post('addcontact', {_address: value, _reload: reload});
|
||||
+ this.http_post('addcontact', {_address: value, _reload: reload, _source: source});
|
||||
};
|
||||
|
||||
// send remote request to search mail or contacts
|
||||
@ -1,67 +0,0 @@
|
||||
$OpenBSD: patch-program_lib_Roundcube_rcube_addressbook_php,v 1.1 2021/10/29 14:00:00 sthen Exp $
|
||||
|
||||
From d73d81032f12bafa691b8f74c50b9bd7caf75606 Mon Sep 17 00:00:00 2001
|
||||
From: Aleksander Machniak <alec@alec.pl>
|
||||
Date: Thu, 21 Oct 2021 19:52:04 +0200
|
||||
Subject: [PATCH] Fix some PHP8 warnings (#8239)
|
||||
|
||||
Index: program/lib/Roundcube/rcube_addressbook.php
|
||||
--- program/lib/Roundcube/rcube_addressbook.php.orig
|
||||
+++ program/lib/Roundcube/rcube_addressbook.php
|
||||
@@ -685,20 +685,34 @@ abstract class rcube_addressbook
|
||||
static $compose_mode;
|
||||
|
||||
if (!isset($compose_mode)) {
|
||||
- $compose_mode = rcube::get_instance()->config->get('addressbook_name_listing', 0);
|
||||
+ $compose_mode = (int) rcube::get_instance()->config->get('addressbook_name_listing', 0);
|
||||
}
|
||||
|
||||
+ $get_names = function ($contact, $fields) {
|
||||
+ $result = [];
|
||||
+ foreach ($fields as $field) {
|
||||
+ if (!empty($contact[$field])) {
|
||||
+ $result[] = $contact[$field];
|
||||
+ }
|
||||
+ }
|
||||
+ return $result;
|
||||
+ };
|
||||
+
|
||||
switch ($compose_mode) {
|
||||
case 3:
|
||||
- $fn = implode(' ', [$contact['surname'] . ',', $contact['firstname'], $contact['middlename']]);
|
||||
+ $names = $get_names($contact, ['firstname', 'middlename']);
|
||||
+ if (!empty($contact['surname'])) {
|
||||
+ array_unshift($names, $contact['surname'] . ',');
|
||||
+ }
|
||||
+ $fn = implode(' ', $names);
|
||||
break;
|
||||
case 2:
|
||||
$keys = ['surname', 'firstname', 'middlename'];
|
||||
- $fn = implode(' ', array_filter(array_intersect_key($contact, array_flip($keys))));
|
||||
+ $fn = implode(' ', $get_names($contact, $keys));
|
||||
break;
|
||||
case 1:
|
||||
$keys = ['firstname', 'middlename', 'surname'];
|
||||
- $fn = implode(' ', array_filter(array_intersect_key($contact, array_flip($keys))));
|
||||
+ $fn = implode(' ', $get_names($contact, $keys));
|
||||
break;
|
||||
case 0:
|
||||
if (!empty($contact['name'])) {
|
||||
@@ -706,7 +720,7 @@ abstract class rcube_addressbook
|
||||
}
|
||||
else {
|
||||
$keys = ['prefix', 'firstname', 'middlename', 'surname', 'suffix'];
|
||||
- $fn = implode(' ', array_filter(array_intersect_key($contact, array_flip($keys))));
|
||||
+ $fn = implode(' ', $get_names($contact, $keys));
|
||||
}
|
||||
break;
|
||||
default:
|
||||
@@ -720,7 +734,7 @@ abstract class rcube_addressbook
|
||||
// fallbacks...
|
||||
if ($fn === '') {
|
||||
// ... display name
|
||||
- if ($name = trim($contact['name'])) {
|
||||
+ if (isset($contact['name']) && ($name = trim($contact['name']))) {
|
||||
$fn = $name;
|
||||
}
|
||||
// ... organization
|
||||
@ -1,38 +0,0 @@
|
||||
$OpenBSD: patch-program_lib_Roundcube_rcube_charset_php,v 1.1 2021/10/29 14:00:00 sthen Exp $
|
||||
|
||||
From ca0cce0e11800adb5e7def6141a30b9a19dfaf5c Mon Sep 17 00:00:00 2001
|
||||
From: Aleksander Machniak <alec@alec.pl>
|
||||
Date: Thu, 28 Oct 2021 14:09:29 +0200
|
||||
Subject: [PATCH] Fix charset conversion errors on PHP < 8 for charsets not
|
||||
supported by mbstring (#8252)
|
||||
|
||||
Index: program/lib/Roundcube/rcube_charset.php
|
||||
--- program/lib/Roundcube/rcube_charset.php.orig
|
||||
+++ program/lib/Roundcube/rcube_charset.php
|
||||
@@ -281,7 +281,7 @@ class rcube_charset
|
||||
}
|
||||
|
||||
$out = false;
|
||||
- $error_handler = function() use ($out) { $out = false; };
|
||||
+ $error_handler = function() { throw new \Exception(); };
|
||||
|
||||
// Ignore invalid characters
|
||||
$mbstring_sc = mb_substitute_character();
|
||||
@@ -328,10 +328,14 @@ class rcube_charset
|
||||
// If iconv reports an illegal character in input it means that input string
|
||||
// has been truncated. It's reported as E_NOTICE.
|
||||
// PHP8 will also throw E_WARNING on unsupported encoding.
|
||||
- set_error_handler($error_handler, E_NOTICE);
|
||||
- set_error_handler($error_handler, E_WARNING);
|
||||
+ set_error_handler($error_handler, E_NOTICE | E_WARNING);
|
||||
|
||||
- $out = iconv($from, $to . $iconv_options, $str);
|
||||
+ try {
|
||||
+ $out = iconv($from, $to . $iconv_options, $str);
|
||||
+ }
|
||||
+ catch (Throwable $e) {
|
||||
+ $out = false;
|
||||
+ }
|
||||
|
||||
restore_error_handler();
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-program_lib_Roundcube_rcube_mime_php,v 1.3 2021/10/29 14:00:00 sthen Exp $
|
||||
|
||||
From d73d81032f12bafa691b8f74c50b9bd7caf75606 Mon Sep 17 00:00:00 2001
|
||||
From: Aleksander Machniak <alec@alec.pl>
|
||||
Date: Thu, 21 Oct 2021 19:52:04 +0200
|
||||
Subject: [PATCH] Fix some PHP8 warnings (#8239)
|
||||
|
||||
Index: program/lib/Roundcube/rcube_mime.php
|
||||
--- program/lib/Roundcube/rcube_mime.php.orig
|
||||
+++ program/lib/Roundcube/rcube_mime.php
|
||||
@@ -494,7 +494,9 @@ class rcube_mime
|
||||
// remove quote chars
|
||||
$line = substr($line, $q);
|
||||
// remove (optional) space-staffing
|
||||
- if ($line[0] === ' ') $line = substr($line, 1);
|
||||
+ if (isset($line[0]) && $line[0] === ' ') {
|
||||
+ $line = substr($line, 1);
|
||||
+ }
|
||||
|
||||
// The same paragraph (We join current line with the previous one) when:
|
||||
// - the same level of quoting
|
||||
@ -1,67 +0,0 @@
|
||||
$OpenBSD: patch-program_lib_Roundcube_rcube_result_index_php,v 1.1 2021/10/29 14:00:00 sthen Exp $
|
||||
|
||||
From ce3afe163878b0f287f3180be6aee53e8f3817ef Mon Sep 17 00:00:00 2001
|
||||
From: Aleksander Machniak <alec@alec.pl>
|
||||
Date: Sat, 23 Oct 2021 09:25:20 +0200
|
||||
Subject: [PATCH] Fix bug where new messages were not added to the list on
|
||||
refresh if skip_deleted=true (#8234)
|
||||
|
||||
From f3dbc94a42308a77062a0f65c3f580269bba4558 Mon Sep 17 00:00:00 2001
|
||||
From: Aleksander Machniak <alec@alec.pl>
|
||||
Date: Sat, 23 Oct 2021 09:29:19 +0200
|
||||
Subject: [PATCH] Fix PHP8 warning
|
||||
|
||||
Index: program/lib/Roundcube/rcube_result_index.php
|
||||
--- program/lib/Roundcube/rcube_result_index.php.orig
|
||||
+++ program/lib/Roundcube/rcube_result_index.php
|
||||
@@ -145,7 +145,8 @@ class rcube_result_index
|
||||
*/
|
||||
public function is_empty()
|
||||
{
|
||||
- return empty($this->raw_data);
|
||||
+ return empty($this->raw_data)
|
||||
+ && empty($this->meta['max']) && empty($this->meta['min']) && empty($this->meta['count']);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -193,7 +194,11 @@ class rcube_result_index
|
||||
}
|
||||
|
||||
if (!isset($this->meta['max'])) {
|
||||
- $this->meta['max'] = (int) @max($this->get());
|
||||
+ $this->meta['max'] = null;
|
||||
+ $all = $this->get();
|
||||
+ if (!empty($all)) {
|
||||
+ $this->meta['max'] = (int) max($all);
|
||||
+ }
|
||||
}
|
||||
|
||||
return $this->meta['max'];
|
||||
@@ -211,7 +216,11 @@ class rcube_result_index
|
||||
}
|
||||
|
||||
if (!isset($this->meta['min'])) {
|
||||
- $this->meta['min'] = (int) @min($this->get());
|
||||
+ $this->meta['min'] = null;
|
||||
+ $all = $this->get();
|
||||
+ if (!empty($all)) {
|
||||
+ $this->meta['min'] = (int) min($all);
|
||||
+ }
|
||||
}
|
||||
|
||||
return $this->meta['min'];
|
||||
@@ -343,11 +352,11 @@ class rcube_result_index
|
||||
*/
|
||||
public function get_element($index)
|
||||
{
|
||||
- $count = $this->count();
|
||||
-
|
||||
- if (!$count) {
|
||||
+ if (empty($this->raw_data)) {
|
||||
return null;
|
||||
}
|
||||
+
|
||||
+ $count = $this->count();
|
||||
|
||||
// first element
|
||||
if ($index === 0 || $index === '0' || $index === 'FIRST') {
|
||||
@ -1,20 +0,0 @@
|
||||
$OpenBSD: patch-skins_larry_ui_js,v 1.1 2021/10/29 14:00:00 sthen Exp $
|
||||
|
||||
From eb5e38558d40ce7f34a4a795248d092810d72cf4 Mon Sep 17 00:00:00 2001
|
||||
From: Aleksander Machniak <alec@alec.pl>
|
||||
Date: Wed, 27 Oct 2021 11:19:34 +0200
|
||||
Subject: [PATCH] Fix bug in Larry skin where headers toggle state was reset on
|
||||
full page preview (#8203)
|
||||
|
||||
Index: skins/larry/ui.js
|
||||
--- skins/larry/ui.js.orig
|
||||
+++ skins/larry/ui.js
|
||||
@@ -171,7 +171,7 @@ function rcube_mail_ui()
|
||||
attachmentmenu_append(this);
|
||||
});
|
||||
|
||||
- if (get_pref('previewheaders') == '1') {
|
||||
+ if (rcmail.env.action == 'preview' && get_pref('previewheaders') == '1') {
|
||||
toggle_preview_headers();
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.67 2021/10/19 07:55:12 sthen Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.68 2021/11/29 10:27:01 sthen Exp $
|
||||
@extraunexec rm -rf %D/roundcubemail/logs/*
|
||||
roundcubemail/
|
||||
roundcubemail/.htaccess.dist
|
||||
@ -548,6 +548,7 @@ roundcubemail/plugins/emoticons/localization/is_IS.inc
|
||||
roundcubemail/plugins/emoticons/localization/it_IT.inc
|
||||
roundcubemail/plugins/emoticons/localization/ja_JP.inc
|
||||
roundcubemail/plugins/emoticons/localization/ko_KR.inc
|
||||
roundcubemail/plugins/emoticons/localization/ku_IQ.inc
|
||||
roundcubemail/plugins/emoticons/localization/lt_LT.inc
|
||||
roundcubemail/plugins/emoticons/localization/lv_LV.inc
|
||||
roundcubemail/plugins/emoticons/localization/mk_MK.inc
|
||||
@ -1248,6 +1249,7 @@ roundcubemail/plugins/markasjunk/localization/de_DE.inc
|
||||
roundcubemail/plugins/markasjunk/localization/el_GR.inc
|
||||
roundcubemail/plugins/markasjunk/localization/en_GB.inc
|
||||
roundcubemail/plugins/markasjunk/localization/en_US.inc
|
||||
roundcubemail/plugins/markasjunk/localization/es_AR.inc
|
||||
roundcubemail/plugins/markasjunk/localization/es_ES.inc
|
||||
roundcubemail/plugins/markasjunk/localization/et_EE.inc
|
||||
roundcubemail/plugins/markasjunk/localization/eu_ES.inc
|
||||
@ -1255,9 +1257,11 @@ roundcubemail/plugins/markasjunk/localization/fi_FI.inc
|
||||
roundcubemail/plugins/markasjunk/localization/fr_FR.inc
|
||||
roundcubemail/plugins/markasjunk/localization/ga_IE.inc
|
||||
roundcubemail/plugins/markasjunk/localization/he_IL.inc
|
||||
roundcubemail/plugins/markasjunk/localization/hr_HR.inc
|
||||
roundcubemail/plugins/markasjunk/localization/hu_HU.inc
|
||||
roundcubemail/plugins/markasjunk/localization/id_ID.inc
|
||||
roundcubemail/plugins/markasjunk/localization/is_IS.inc
|
||||
roundcubemail/plugins/markasjunk/localization/it_IT.inc
|
||||
roundcubemail/plugins/markasjunk/localization/ja_JP.inc
|
||||
roundcubemail/plugins/markasjunk/localization/ko_KR.inc
|
||||
roundcubemail/plugins/markasjunk/localization/lt_LT.inc
|
||||
@ -2400,6 +2404,7 @@ roundcubemail/program/localization/de_CH/
|
||||
roundcubemail/program/localization/de_CH/csv2vcard.inc
|
||||
roundcubemail/program/localization/de_CH/labels.inc
|
||||
roundcubemail/program/localization/de_CH/messages.inc
|
||||
roundcubemail/program/localization/de_CH/timezones.inc
|
||||
roundcubemail/program/localization/de_DE/
|
||||
roundcubemail/program/localization/de_DE/csv2vcard.inc
|
||||
roundcubemail/program/localization/de_DE/labels.inc
|
||||
@ -2431,6 +2436,7 @@ roundcubemail/program/localization/es_419/timezones.inc
|
||||
roundcubemail/program/localization/es_AR/
|
||||
roundcubemail/program/localization/es_AR/labels.inc
|
||||
roundcubemail/program/localization/es_AR/messages.inc
|
||||
roundcubemail/program/localization/es_AR/timezones.inc
|
||||
roundcubemail/program/localization/es_ES/
|
||||
roundcubemail/program/localization/es_ES/csv2vcard.inc
|
||||
roundcubemail/program/localization/es_ES/labels.inc
|
||||
@ -2531,6 +2537,7 @@ roundcubemail/program/localization/ku/messages.inc
|
||||
roundcubemail/program/localization/ku_IQ/
|
||||
roundcubemail/program/localization/ku_IQ/labels.inc
|
||||
roundcubemail/program/localization/ku_IQ/messages.inc
|
||||
roundcubemail/program/localization/ku_IQ/timezones.inc
|
||||
roundcubemail/program/localization/lb_LU/
|
||||
roundcubemail/program/localization/lb_LU/labels.inc
|
||||
roundcubemail/program/localization/lb_LU/messages.inc
|
||||
@ -3546,7 +3553,6 @@ roundcubemail/vendor/pear/console_commandline/README.rst
|
||||
roundcubemail/vendor/pear/console_commandline/composer.json
|
||||
roundcubemail/vendor/pear/console_commandline/data/
|
||||
roundcubemail/vendor/pear/console_commandline/data/xmlschema.rng
|
||||
roundcubemail/vendor/pear/console_commandline/package.xml
|
||||
roundcubemail/vendor/pear/console_getopt/
|
||||
roundcubemail/vendor/pear/console_getopt/.travis.yml
|
||||
roundcubemail/vendor/pear/console_getopt/Console/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user