From 4c4496bccc46e15f05d54235b420c0bff1306db2 Mon Sep 17 00:00:00 2001
From: Paweł Słowik <pawel.slowik@iq.pl>
Date: Fri, 14 Sep 2012 08:48:30 -0400
Subject: [PATCH] Sieve enotify/notify - allow empty body
---
plugins/managesieve/lib/rcube_sieve_script.php | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/plugins/managesieve/lib/rcube_sieve_script.php b/plugins/managesieve/lib/rcube_sieve_script.php
index 3e418ed..debe9c1 100644
--- a/plugins/managesieve/lib/rcube_sieve_script.php
+++ b/plugins/managesieve/lib/rcube_sieve_script.php
@@ -411,9 +411,15 @@
$action_script .= " :$n_tag " . self::escape_string($action[$n_tag]);
}
}
- $method = (!empty($action['address']) && !empty($action['body'])) ?
- sprintf('mailto:%s?body=%s', $action['address'], rawurlencode($action['body'])) :
- $action['method'];
+ if (!empty($action['address'])) {
+ $method = 'mailto:' . $action['address'];
+ if (!empty($action['body'])) {
+ $method .= '?body=' . rawurlencode($action['body']);
+ }
+ }
+ else {
+ $method = $action['method'];
+ }
$action_script .= " " . self::escape_string($method);
break;
--
Gitblit v1.9.1