diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-02-17 10:32:38 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-02-17 10:37:16 +0100 |
| commit | ee393929a6c4ed165b47a0ae5ae0e87b6da999fb (patch) | |
| tree | c0d2c810c0c088a96e07e7bfe7acf695809c50c4 /plugins | |
| parent | 8b08ec158b96285f01cbe4cd96d02b7b74e759d2 (diff) | |
Don't trim whitespace in folder names (#1488955)
Conflicts:
plugins/managesieve/Changelog
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/managesieve/Changelog | 2 | ||||
| -rw-r--r-- | plugins/managesieve/managesieve.php | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog index 19799a302..c0b46e070 100644 --- a/plugins/managesieve/Changelog +++ b/plugins/managesieve/Changelog @@ -1,4 +1,6 @@ - Support tls:// prefix in managesieve_host option +- Removed depracated functions usage +- Don't trim whitespace in folder names (#1488955) * version 6.1 [2012-12-21] ----------------------------------------------------------- diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php index d30404ac7..877f6ba41 100644 --- a/plugins/managesieve/managesieve.php +++ b/plugins/managesieve/managesieve.php @@ -835,7 +835,7 @@ class managesieve extends rcube_plugin case 'fileinto': case 'fileinto_copy': - $mailbox = $this->strip_value($mailboxes[$idx]); + $mailbox = $this->strip_value($mailboxes[$idx], false, false); $this->form['actions'][$i]['target'] = $this->mod_mailbox($mailbox, 'in'); if ($type == 'fileinto_copy') { $type = 'fileinto'; @@ -1708,16 +1708,16 @@ class managesieve extends rcube_plugin private function genid() { - $result = preg_replace('/[^0-9]/', '', microtime(true)); - return $result; + return preg_replace('/[^0-9]/', '', microtime(true)); } - private function strip_value($str, $allow_html=false) + private function strip_value($str, $allow_html = false, $trim = true) { - if (!$allow_html) + if (!$allow_html) { $str = strip_tags($str); + } - return trim($str); + return $trim ? trim($str) : $str; } private function error_class($id, $type, $target, $elem_prefix='') |