Fix operations on folders with trailing spaces in name (#1489419)

pull/154/head
Aleksander Machniak 11 years ago
parent d1a17029a3
commit 96247867f2

@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail CHANGELOG Roundcube Webmail
=========================== ===========================
- Fix operations on folders with trailing spaces in name (#1489419)
- Improve identity selection based on From: header (#1489378) - Improve identity selection based on From: header (#1489378)
- Fix issue where mails with inline images of the same name contained only the first image multiple times (#1489406) - Fix issue where mails with inline images of the same name contained only the first image multiple times (#1489406)
- Use left/right arrow keys to collapse/expand thread and spacebar to select a row, change Ctrl key behavior (#1489392) - Use left/right arrow keys to collapse/expand thread and spacebar to select a row, change Ctrl key behavior (#1489392)

@ -28,11 +28,11 @@ function rcmail_folder_form($attrib)
$storage = $RCMAIL->get_storage(); $storage = $RCMAIL->get_storage();
// edited folder name (empty in create-folder mode) // edited folder name (empty in create-folder mode)
$mbox = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true)); $mbox = get_input_value('_mbox', RCUBE_INPUT_GPC, true);
$mbox_imap = rcube_charset_convert($mbox, RCMAIL_CHARSET, 'UTF7-IMAP'); $mbox_imap = rcube_charset_convert($mbox, RCMAIL_CHARSET, 'UTF7-IMAP');
// predefined path for new folder // predefined path for new folder
$parent = trim(get_input_value('_path', RCUBE_INPUT_GPC, true)); $parent = get_input_value('_path', RCUBE_INPUT_GPC, true);
$parent_imap = rcube_charset_convert($parent, RCMAIL_CHARSET, 'UTF7-IMAP'); $parent_imap = rcube_charset_convert($parent, RCMAIL_CHARSET, 'UTF7-IMAP');
$threading_supported = $storage->get_capability('THREAD'); $threading_supported = $storage->get_capability('THREAD');

@ -109,7 +109,7 @@ else if ($RCMAIL->action == 'delete-folder')
else if ($RCMAIL->action == 'rename-folder') else if ($RCMAIL->action == 'rename-folder')
{ {
$name_utf8 = trim(get_input_value('_folder_newname', RCUBE_INPUT_POST, true)); $name_utf8 = trim(get_input_value('_folder_newname', RCUBE_INPUT_POST, true));
$oldname_utf8 = trim(get_input_value('_folder_oldname', RCUBE_INPUT_POST, true)); $oldname_utf8 = get_input_value('_folder_oldname', RCUBE_INPUT_POST, true);
if (strlen($name_utf8) && strlen($oldname_utf8)) { if (strlen($name_utf8) && strlen($oldname_utf8)) {
$name = rcube_charset_convert($name_utf8, RCMAIL_CHARSET, 'UTF7-IMAP'); $name = rcube_charset_convert($name_utf8, RCMAIL_CHARSET, 'UTF7-IMAP');
@ -167,7 +167,7 @@ else if ($RCMAIL->action == 'purge')
// get mailbox size // get mailbox size
else if ($RCMAIL->action == 'folder-size') else if ($RCMAIL->action == 'folder-size')
{ {
$name = trim(get_input_value('_mbox', RCUBE_INPUT_POST, true)); $name = get_input_value('_mbox', RCUBE_INPUT_POST, true);
$size = $STORAGE->folder_size($name); $size = $STORAGE->folder_size($name);

@ -5,7 +5,7 @@
| program/steps/settings/save_folder.inc | | program/steps/settings/save_folder.inc |
| | | |
| This file is part of the Roundcube Webmail client | | This file is part of the Roundcube Webmail client |
| Copyright (C) 2005-2012, The Roundcube Dev Team | | Copyright (C) 2005-2013, The Roundcube Dev Team |
| | | |
| Licensed under the GNU General Public License version 3 or | | Licensed under the GNU General Public License version 3 or |
| any later version with exceptions for skins & plugins. | | any later version with exceptions for skins & plugins. |
@ -26,8 +26,8 @@ $STORAGE = $RCMAIL->get_storage();
$name = trim(get_input_value('_name', RCUBE_INPUT_POST, true)); $name = trim(get_input_value('_name', RCUBE_INPUT_POST, true));
$old = trim(get_input_value('_mbox', RCUBE_INPUT_POST, true)); $old = get_input_value('_mbox', RCUBE_INPUT_POST, true);
$path = trim(get_input_value('_parent', RCUBE_INPUT_POST, true)); $path = get_input_value('_parent', RCUBE_INPUT_POST, true);
$name_imap = rcube_charset_convert($name, RCMAIL_CHARSET, 'UTF7-IMAP'); $name_imap = rcube_charset_convert($name, RCMAIL_CHARSET, 'UTF7-IMAP');
$old_imap = rcube_charset_convert($old, RCMAIL_CHARSET, 'UTF7-IMAP'); $old_imap = rcube_charset_convert($old, RCMAIL_CHARSET, 'UTF7-IMAP');

Loading…
Cancel
Save