From 6315554adc0f419fa7b2c0d93d78a7278651385b Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Sun, 26 Apr 2020 21:39:19 -0400 Subject: [PATCH] fsf changes, meant to be rebased on upstream As upstream changes, rebase this commit on top. The change to read_body.php, documented here https://sourceforge.net/p/squirrelmail/mailman/message/36992407/ copied here in case that link dies: In the svn version, when viewing a message, if you click the move or copy button, the page changes to the list of messages. In older versions such as 1.4.13, that button was enabled by the delete_move_next plugin, and when pressing move, the page would change to the next message. That is clearly the way it should work. When using the preview panel, this behavior especially makes no sense because you were already seeing the message list and it just turns the preview panel into blank space. After a quick look into the code, I was able to make a one line change to the svn version so that the the page does not change at all when pressing move, which helps workaround the problem so that I can then press a key to go to the next message. I'm hoping someone here is familiar with the code and can help identify the root cause and find a proper fix so it goes to the next message. Here is a comparison of the post request when clicking move in svn vs old working 1.4.13: SVN post: https://webmail.fsf.org/src/read_body.php?mailbox=INBOX&sort=6&startMessage=1&passed_id=18 form data: show_more "0" move_id "19" targetMailbox "INBOX.Trash" Working 1.4.13 post: https://mail1p.fsf.org/src/right_main.php form data: smtoken "EEZR1hS4cPUh" mailbox "INBOX" msg[0] "19" targetMailbox "INBOX.Trash" moveButton "Move" I figured out that if the post url didn't have any path, or had a path of "right_main.php", like the old version, it would stop changing the page, and there was already an example in the code of not passing the path, so I copied that to make this hacky patch. I enabled level 2 debug mode, didnt result in any output in the logs. Configtest shows no errors. --- images/fsf.png | Bin 0 -> 9304 bytes plugins/squirrelspell/sqspell_config.php | 5 ++--- src/read_body.php | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 images/fsf.png diff --git a/images/fsf.png b/images/fsf.png new file mode 100644 index 0000000000000000000000000000000000000000..8d11491052fd29807583933d2bb6cc40e502c642 GIT binary patch literal 9304 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 'ispell -a', - 'Spanish' => 'ispell -d spanish -a'); +$SQSPELL_APP = array('English' => 'aspell -a'); /** * Sample configuration for PHP pspell extension. Sets dictionary options. diff --git a/src/read_body.php b/src/read_body.php index 041591b6..9e8bb97a 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -8,7 +8,7 @@ * * @copyright 1999-2022 The SquirrelMail Project Team * @license http://opensource.org/licenses/gpl-license.php GNU Public License - * @version $Id$ + * @version $Id: read_body.php 14845 2020-01-07 08:09:34Z pdontthink $ * @package squirrelmail */ -- 2.25.1