diff options
| author | thomascube <thomas@roundcube.net> | 2011-08-18 18:34:56 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2011-08-18 18:34:56 +0000 |
| commit | b6cd452bd31bfd4b6b94b23fe54b424fdf901e61 (patch) | |
| tree | 7b8640c4f06ef5a564a0a25c9f6d7d58d9d9abbc /plugins | |
| parent | b1cde954d15abedbb2874f592c59155e049244ef (diff) | |
Backport changes from r5084 to r5090 to release branch
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/acl/acl.js | 2 | ||||
| -rw-r--r-- | plugins/acl/acl.php | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js index 3cca7bf1e..d78607690 100644 --- a/plugins/acl/acl.js +++ b/plugins/acl/acl.js @@ -1,7 +1,7 @@ /** * ACL plugin script * - * @version 0.5 + * @version 0.6 * @author Aleksander Machniak <alec@alec.pl> */ diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php index 33f84dbc3..1b021d00a 100644 --- a/plugins/acl/acl.php +++ b/plugins/acl/acl.php @@ -3,7 +3,7 @@ /** * Folders Access Control Lists Management (RFC4314, RFC2086) * - * @version 0.5 + * @version 0.6 * @author Aleksander Machniak <alec@alec.pl> * * @@ -427,7 +427,7 @@ class acl extends rcube_plugin */ private function action_save() { - $mbox = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true, 'UTF7-IMAP')); + $mbox = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true)); // UTF7-IMAP $user = trim(get_input_value('_user', RCUBE_INPUT_GPC)); $acl = trim(get_input_value('_acl', RCUBE_INPUT_GPC)); $oldid = trim(get_input_value('_old', RCUBE_INPUT_GPC)); @@ -464,7 +464,7 @@ class acl extends rcube_plugin */ private function action_delete() { - $mbox = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true, 'UTF7-IMAP')); + $mbox = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true)); //UTF7-IMAP $user = trim(get_input_value('_user', RCUBE_INPUT_GPC)); $user = explode(',', $user); @@ -495,7 +495,7 @@ class acl extends rcube_plugin return; } - $this->mbox = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true, 'UTF7-IMAP')); + $this->mbox = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true)); // UTF7-IMAP $advanced = trim(get_input_value('_mode', RCUBE_INPUT_GPC)); $advanced = $advanced == 'advanced' ? true : false; |