No OneTemporary
Actions

Authored By

Unknown

Size

245 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
	index cfde7c011..5f5a6b072 100644
	--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
	+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
	@@ -1,2516 +1,2534 @@
	<?php

	/**
	* Managesieve (Sieve Filters) Engine
	*
	* Engine part of Managesieve plugin implementing UI and backend access.
	*
	* Copyright (C) 2008-2014, The Roundcube Dev Team
	* Copyright (C) 2011-2014, Kolab Systems AG
	*
	* This program is free software: you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation, either version 3 of the License, or
	* (at your option) any later version.
	*
	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.
	*
	* You should have received a copy of the GNU General Public License
	* along with this program. If not, see http://www.gnu.org/licenses/.
	*/

	class rcube_sieve_engine
	{
	protected $rc;
	protected $sieve;
	protected $errors;
	protected $form;
	protected $list;
	protected $tips = array();
	protected $script = array();
	protected $exts = array();
	protected $active = array();
	protected $headers = array(
	'subject' => 'Subject',
	'from' => 'From',
	'to' => 'To',
	);
	protected $addr_headers = array(
	// Required
	"from", "to", "cc", "bcc", "sender", "resent-from", "resent-to",
	// Additional (RFC 822 / RFC 2822)
	"reply-to", "resent-reply-to", "resent-sender", "resent-cc", "resent-bcc",
	// Non-standard (RFC 2076, draft-palme-mailext-headers-08.txt)
	"for-approval", "for-handling", "for-comment", "apparently-to", "errors-to",
	"delivered-to", "return-receipt-to", "x-admin", "read-receipt-to",
	"x-confirm-reading-to", "return-receipt-requested",
	"registered-mail-reply-requested-by", "mail-followup-to", "mail-reply-to",
	"abuse-reports-to", "x-complaints-to", "x-report-abuse-to",
	// Undocumented
	"x-beenthere",
	);
	protected $notify_methods = array(
	'mailto',
	// 'sms',
	// 'tel',
	);
	protected $notify_importance_options = array(
	3 => 'notifyimportancelow',
	2 => 'notifyimportancenormal',
	1 => 'notifyimportancehigh'
	);

	const VERSION = '8.7';
	const PROGNAME = 'Roundcube (Managesieve)';
	const PORT = 4190;


	/**
	* Class constructor
	*/
	function __construct($plugin)
	{
	$this->rc = rcube::get_instance();
	$this->plugin = $plugin;
	}

	/**
	* Loads configuration, initializes plugin (including sieve connection)
	*/
	function start($mode = null)
	{
	// register UI objects
	$this->rc->output->add_handlers(array(
	'filterslist' => array($this, 'filters_list'),
	'filtersetslist' => array($this, 'filtersets_list'),
	'filterframe' => array($this, 'filter_frame'),
	'filterform' => array($this, 'filter_form'),
	'filtersetform' => array($this, 'filterset_form'),
	));

	// connect to managesieve server
	$error = $this->connect($_SESSION['username'], $this->rc->decrypt($_SESSION['password']));

	// load current/active script
	if (!$error) {
	// Get list of scripts
	$list = $this->list_scripts();

	// reset current script when entering filters UI (#1489412)
	if ($this->rc->action == 'plugin.managesieve') {
	$this->rc->session->remove('managesieve_current');
	}

	if ($mode != 'vacation') {
	if (!empty($_GET['_set']) \|\| !empty($_POST['_set'])) {
	$script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
	}
	else if (!empty($_SESSION['managesieve_current'])) {
	$script_name = $_SESSION['managesieve_current'];
	}
	}

	$error = $this->load_script($script_name);
	}

	// finally set script objects
	if ($error) {
	switch ($error) {
	case rcube_sieve::ERROR_CONNECTION:
	case rcube_sieve::ERROR_LOGIN:
	$this->rc->output->show_message('managesieve.filterconnerror', 'error');
	break;

	default:
	$this->rc->output->show_message('managesieve.filterunknownerror', 'error');
	break;
	}

	// reload interface in case of possible error when specified script wasn't found (#1489412)
	if ($script_name !== null && !empty($list) && !in_array($script_name, $list)) {
	$this->rc->output->command('reload', 500);
	}

	// to disable 'Add filter' button set env variable
	$this->rc->output->set_env('filterconnerror', true);
	$this->script = array();
	}
	else {
	$this->exts = $this->sieve->get_extensions();
	$this->init_script();
	$this->rc->output->set_env('currentset', $this->sieve->current);
	$_SESSION['managesieve_current'] = $this->sieve->current;
	}

	return $error;
	}

	/**
	* Connect to configured managesieve server
	*
	* @param string $username User login
	* @param string $password User password
	*
	* @return int Connection status: 0 on success, >0 on failure
	*/
	public function connect($username, $password)
	{
	// Get connection parameters
	$host = $this->rc->config->get('managesieve_host', 'localhost');
	$port = $this->rc->config->get('managesieve_port');
	$tls = $this->rc->config->get('managesieve_usetls', false);

	$host = rcube_utils::parse_host($host);
	$host = rcube_utils::idn_to_ascii($host);

	// remove tls:// prefix, set TLS flag
	if (($host = preg_replace('\|^tls://\|i', '', $host, 1, $cnt)) && $cnt) {
	$tls = true;
	}

	if (empty($port)) {
	$port = getservbyname('sieve', 'tcp');
	if (empty($port)) {
	$port = self::PORT;
	}
	}

	$plugin = $this->rc->plugins->exec_hook('managesieve_connect', array(
	'user' => $username,
	'password' => $password,
	'host' => $host,
	'port' => $port,
	'usetls' => $tls,
	'auth_type' => $this->rc->config->get('managesieve_auth_type'),
	'disabled' => $this->rc->config->get('managesieve_disabled_extensions'),
	'debug' => $this->rc->config->get('managesieve_debug', false),
	'auth_cid' => $this->rc->config->get('managesieve_auth_cid'),
	'auth_pw' => $this->rc->config->get('managesieve_auth_pw'),
	'socket_options' => $this->rc->config->get('managesieve_conn_options'),
	));

	// try to connect to managesieve server and to fetch the script
	$this->sieve = new rcube_sieve(
	$plugin['user'],
	$plugin['password'],
	$plugin['host'],
	$plugin['port'],
	$plugin['auth_type'],
	$plugin['usetls'],
	$plugin['disabled'],
	$plugin['debug'],
	$plugin['auth_cid'],
	$plugin['auth_pw'],
	$plugin['socket_options']
	);

	$error = $this->sieve->error();

	if ($error) {
	rcube::raise_error(array(
	'code' => 403,
	'file' => __FILE__,
	'line' => __LINE__,
	'message' => "Unable to connect to managesieve on $host:$port"
	), true, false);
	}

	return $error;
	}

	/**
	* Load specified (or active) script
	*
	* @param string $script_name Optional script name
	*
	* @return int Connection status: 0 on success, >0 on failure
	*/
	protected function load_script($script_name = null)
	{
	// Get list of scripts
	$list = $this->list_scripts();

	if ($script_name === null \|\| $script_name === '') {
	// get (first) active script
	if (!empty($this->active)) {
	$script_name = $this->active[0];
	}
	else if ($list) {
	$script_name = $list[0];
	}
	// create a new (initial) script
	else {
	// if script not exists build default script contents
	$script_file = $this->rc->config->get('managesieve_default');
	$script_name = $this->rc->config->get('managesieve_script_name');

	if (empty($script_name)) {
	$script_name = 'roundcube';
	}

	if ($script_file && is_readable($script_file)) {
	$content = file_get_contents($script_file);
	}

	// add script and set it active
	if ($this->sieve->save_script($script_name, $content)) {
	$this->activate_script($script_name);
	$this->list[] = $script_name;
	}
	}
	}

	if ($script_name) {
	$this->sieve->load($script_name);
	}

	return $this->sieve->error();
	}

	/**
	* User interface actions handler
	*/
	function actions()
	{
	$error = $this->start();

	// Handle user requests
	if ($action = rcube_utils::get_input_value('_act', rcube_utils::INPUT_GPC)) {
	$fid = (int) rcube_utils::get_input_value('_fid', rcube_utils::INPUT_POST);

	if ($action == 'delete' && !$error) {
	if (isset($this->script[$fid])) {
	if ($this->sieve->script->delete_rule($fid))
	$result = $this->save_script();

	if ($result === true) {
	$this->rc->output->show_message('managesieve.filterdeleted', 'confirmation');
	$this->rc->output->command('managesieve_updatelist', 'del', array('id' => $fid));
	} else {
	$this->rc->output->show_message('managesieve.filterdeleteerror', 'error');
	}
	}
	}
	else if ($action == 'move' && !$error) {
	if (isset($this->script[$fid])) {
	$to = (int) rcube_utils::get_input_value('_to', rcube_utils::INPUT_POST);
	$rule = $this->script[$fid];

	// remove rule
	unset($this->script[$fid]);
	$this->script = array_values($this->script);

	// add at target position
	if ($to >= count($this->script)) {
	$this->script[] = $rule;
	}
	else {
	$script = array();
	foreach ($this->script as $idx => $r) {
	if ($idx == $to)
	$script[] = $rule;
	$script[] = $r;
	}
	$this->script = $script;
	}

	$this->sieve->script->content = $this->script;
	$result = $this->save_script();

	if ($result === true) {
	$result = $this->list_rules();

	$this->rc->output->show_message('managesieve.moved', 'confirmation');
	$this->rc->output->command('managesieve_updatelist', 'list',
	array('list' => $result, 'clear' => true, 'set' => $to));
	} else {
	$this->rc->output->show_message('managesieve.moveerror', 'error');
	}
	}
	}
	else if ($action == 'act' && !$error) {
	if (isset($this->script[$fid])) {
	$rule = $this->script[$fid];
	$disabled = !empty($rule['disabled']);
	$rule['disabled'] = !$disabled;
	$result = $this->sieve->script->update_rule($fid, $rule);

	if ($result !== false)
	$result = $this->save_script();

	if ($result === true) {
	if ($rule['disabled'])
	$this->rc->output->show_message('managesieve.deactivated', 'confirmation');
	else
	$this->rc->output->show_message('managesieve.activated', 'confirmation');
	$this->rc->output->command('managesieve_updatelist', 'update',
	array('id' => $fid, 'disabled' => $rule['disabled']));
	} else {
	if ($rule['disabled'])
	$this->rc->output->show_message('managesieve.deactivateerror', 'error');
	else
	$this->rc->output->show_message('managesieve.activateerror', 'error');
	}
	}
	}
	else if ($action == 'setact' && !$error) {
	$script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_POST, true);
	$result = $this->activate_script($script_name);
	$kep14 = $this->rc->config->get('managesieve_kolab_master');

	if ($result === true) {
	$this->rc->output->set_env('active_sets', $this->active);
	$this->rc->output->show_message('managesieve.setactivated', 'confirmation');
	$this->rc->output->command('managesieve_updatelist', 'setact',
	array('name' => $script_name, 'active' => true, 'all' => !$kep14));
	} else {
	$this->rc->output->show_message('managesieve.setactivateerror', 'error');
	}
	}
	else if ($action == 'deact' && !$error) {
	$script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_POST, true);
	$result = $this->deactivate_script($script_name);

	if ($result === true) {
	$this->rc->output->set_env('active_sets', $this->active);
	$this->rc->output->show_message('managesieve.setdeactivated', 'confirmation');
	$this->rc->output->command('managesieve_updatelist', 'setact',
	array('name' => $script_name, 'active' => false));
	} else {
	$this->rc->output->show_message('managesieve.setdeactivateerror', 'error');
	}
	}
	else if ($action == 'setdel' && !$error) {
	$script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_POST, true);
	$result = $this->remove_script($script_name);

	if ($result === true) {
	$this->rc->output->show_message('managesieve.setdeleted', 'confirmation');
	$this->rc->output->command('managesieve_updatelist', 'setdel',
	array('name' => $script_name));
	$this->rc->session->remove('managesieve_current');
	} else {
	$this->rc->output->show_message('managesieve.setdeleteerror', 'error');
	}
	}
	else if ($action == 'setget') {
	$this->rc->request_security_check(rcube_utils::INPUT_GET);

	$script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
	$script = $this->sieve->get_script($script_name);

	if (is_a($script, 'PEAR_Error')) {
	exit;
	}

	$browser = new rcube_browser;

	// send download headers
	header("Content-Type: application/octet-stream");
	header("Content-Length: ".strlen($script));

	if ($browser->ie) {
	header("Content-Type: application/force-download");
	$filename = rawurlencode($script_name);
	}
	else {
	$filename = addcslashes($script_name, '\\"');
	}

	header("Content-Disposition: attachment; filename=\"$filename.txt\"");
	echo $script;
	exit;
	}
	else if ($action == 'list') {
	$result = $this->list_rules();

	$this->rc->output->command('managesieve_updatelist', 'list', array('list' => $result));
	}
	else if ($action == 'ruleadd') {
	$rid = rcube_utils::get_input_value('_rid', rcube_utils::INPUT_POST);
	$id = $this->genid();
	$content = $this->rule_div($fid, $id, false);

	$this->rc->output->command('managesieve_rulefill', $content, $id, $rid);
	}
	else if ($action == 'actionadd') {
	$aid = rcube_utils::get_input_value('_aid', rcube_utils::INPUT_POST);
	$id = $this->genid();
	$content = $this->action_div($fid, $id, false);

	$this->rc->output->command('managesieve_actionfill', $content, $id, $aid);
	}
	else if ($action == 'addresses') {
	$aid = rcube_utils::get_input_value('_aid', rcube_utils::INPUT_POST);

	$this->rc->output->command('managesieve_vacation_addresses_update', $aid, $this->user_emails());
	}

	$this->rc->output->send();
	}
	else if ($this->rc->task == 'mail') {
	// Initialize the form
	$rules = rcube_utils::get_input_value('r', rcube_utils::INPUT_GET);
	if (!empty($rules)) {
	$i = 0;
	foreach ($rules as $rule) {
	list($header, $value) = explode(':', $rule, 2);
	$tests[$i] = array(
	'type' => 'contains',
	'test' => 'header',
	'arg1' => $header,
	'arg2' => $value,
	);
	$i++;
	}

	$this->form = array(
	'join' => count($tests) > 1 ? 'allof' : 'anyof',
	'name' => '',
	'tests' => $tests,
	'actions' => array(
	0 => array('type' => 'fileinto'),
	1 => array('type' => 'stop'),
	),
	);
	}
	}

	$this->send();
	}

	function save()
	{
	// Init plugin and handle managesieve connection
	$error = $this->start();

	// get request size limits (#1488648)
	$max_post = max(array(
	ini_get('max_input_vars'),
	ini_get('suhosin.request.max_vars'),
	ini_get('suhosin.post.max_vars'),
	));
	$max_depth = max(array(
	ini_get('suhosin.request.max_array_depth'),
	ini_get('suhosin.post.max_array_depth'),
	));

	// check request size limit
	if ($max_post && count($_POST, COUNT_RECURSIVE) >= $max_post) {
	rcube::raise_error(array(
	'code' => 500, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Request size limit exceeded (one of max_input_vars/suhosin.request.max_vars/suhosin.post.max_vars)"
	), true, false);
	$this->rc->output->show_message('managesieve.filtersaveerror', 'error');
	}
	// check request depth limits
	else if ($max_depth && count($_POST['_header']) > $max_depth) {
	rcube::raise_error(array(
	'code' => 500, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Request size limit exceeded (one of suhosin.request.max_array_depth/suhosin.post.max_array_depth)"
	), true, false);
	$this->rc->output->show_message('managesieve.filtersaveerror', 'error');
	}
	// filters set add action
	else if (!empty($_POST['_newset'])) {
	$name = rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST, true);
	$copy = rcube_utils::get_input_value('_copy', rcube_utils::INPUT_POST, true);
	$from = rcube_utils::get_input_value('_from', rcube_utils::INPUT_POST);
	$exceptions = $this->rc->config->get('managesieve_filename_exceptions');
	$kolab = $this->rc->config->get('managesieve_kolab_master');
	$name_uc = mb_strtolower($name);
	$list = $this->list_scripts();

	if (!$name) {
	$this->errors['name'] = $this->plugin->gettext('cannotbeempty');
	}
	else if (mb_strlen($name) > 128) {
	$this->errors['name'] = $this->plugin->gettext('nametoolong');
	}
	else if (!empty($exceptions) && in_array($name, (array)$exceptions)) {
	$this->errors['name'] = $this->plugin->gettext('namereserved');
	}
	else if (!empty($kolab) && in_array($name_uc, array('MASTER', 'USER', 'MANAGEMENT'))) {
	$this->errors['name'] = $this->plugin->gettext('namereserved');
	}
	else if (in_array($name, $list)) {
	$this->errors['name'] = $this->plugin->gettext('setexist');
	}
	else if ($from == 'file') {
	// from file
	if (is_uploaded_file($_FILES['_file']['tmp_name'])) {
	$file = file_get_contents($_FILES['_file']['tmp_name']);
	$file = preg_replace('/\r/', '', $file);
	// for security don't save script directly
	// check syntax before, like this...
	$this->sieve->load_script($file);
	if (!$this->save_script($name)) {
	$this->errors['file'] = $this->plugin->gettext('setcreateerror');
	}
	}
	else { // upload failed
	$err = $_FILES['_file']['error'];

	if ($err == UPLOAD_ERR_INI_SIZE \|\| $err == UPLOAD_ERR_FORM_SIZE) {
	$msg = $this->rc->gettext(array('name' => 'filesizeerror',
	'vars' => array('size' =>
	$this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
	}
	else {
	$this->errors['file'] = $this->plugin->gettext('fileuploaderror');
	}
	}
	}
	else if (!$this->sieve->copy($name, $from == 'set' ? $copy : '')) {
	$error = 'managesieve.setcreateerror';
	}

	if (!$error && empty($this->errors)) {
	// Find position of the new script on the list
	$list[] = $name;
	asort($list, SORT_LOCALE_STRING);
	$list = array_values($list);
	$index = array_search($name, $list);

	$this->rc->output->show_message('managesieve.setcreated', 'confirmation');
	$this->rc->output->command('parent.managesieve_updatelist', 'setadd',
	array('name' => $name, 'index' => $index));
	} else if ($msg) {
	$this->rc->output->command('display_message', $msg, 'error');
	} else if ($error) {
	$this->rc->output->show_message($error, 'error');
	}
	}
	// filter add/edit action
	else if (isset($_POST['_name'])) {
	$name = trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST, true));
	$fid = trim(rcube_utils::get_input_value('_fid', rcube_utils::INPUT_POST));
	$join = trim(rcube_utils::get_input_value('_join', rcube_utils::INPUT_POST));

	// and arrays
	$headers = rcube_utils::get_input_value('_header', rcube_utils::INPUT_POST);
	$cust_headers = rcube_utils::get_input_value('_custom_header', rcube_utils::INPUT_POST);
	+ $cust_vars = rcube_utils::get_input_value('_custom_var', rcube_utils::INPUT_POST);
	$ops = rcube_utils::get_input_value('_rule_op', rcube_utils::INPUT_POST);
	$sizeops = rcube_utils::get_input_value('_rule_size_op', rcube_utils::INPUT_POST);
	$sizeitems = rcube_utils::get_input_value('_rule_size_item', rcube_utils::INPUT_POST);
	$sizetargets = rcube_utils::get_input_value('_rule_size_target', rcube_utils::INPUT_POST);
	$targets = rcube_utils::get_input_value('_rule_target', rcube_utils::INPUT_POST, true);
	$mods = rcube_utils::get_input_value('_rule_mod', rcube_utils::INPUT_POST);
	$mod_types = rcube_utils::get_input_value('_rule_mod_type', rcube_utils::INPUT_POST);
	$body_trans = rcube_utils::get_input_value('_rule_trans', rcube_utils::INPUT_POST);
	$body_types = rcube_utils::get_input_value('_rule_trans_type', rcube_utils::INPUT_POST, true);
	$comparators = rcube_utils::get_input_value('_rule_comp', rcube_utils::INPUT_POST);
	$indexes = rcube_utils::get_input_value('_rule_index', rcube_utils::INPUT_POST);
	$lastindexes = rcube_utils::get_input_value('_rule_index_last', rcube_utils::INPUT_POST);
	$dateheaders = rcube_utils::get_input_value('_rule_date_header', rcube_utils::INPUT_POST);
	$dateparts = rcube_utils::get_input_value('_rule_date_part', rcube_utils::INPUT_POST);
	$message = rcube_utils::get_input_value('_rule_message', rcube_utils::INPUT_POST);
	$dup_handles = rcube_utils::get_input_value('_rule_duplicate_handle', rcube_utils::INPUT_POST, true);
	$dup_headers = rcube_utils::get_input_value('_rule_duplicate_header', rcube_utils::INPUT_POST, true);
	$dup_uniqueids = rcube_utils::get_input_value('_rule_duplicate_uniqueid', rcube_utils::INPUT_POST, true);
	$dup_seconds = rcube_utils::get_input_value('_rule_duplicate_seconds', rcube_utils::INPUT_POST);
	$dup_lasts = rcube_utils::get_input_value('_rule_duplicate_last', rcube_utils::INPUT_POST);
	$act_types = rcube_utils::get_input_value('_action_type', rcube_utils::INPUT_POST, true);
	$mailboxes = rcube_utils::get_input_value('_action_mailbox', rcube_utils::INPUT_POST, true);
	$act_targets = rcube_utils::get_input_value('_action_target', rcube_utils::INPUT_POST, true);
	$domain_targets = rcube_utils::get_input_value('_action_target_domain', rcube_utils::INPUT_POST);
	$area_targets = rcube_utils::get_input_value('_action_target_area', rcube_utils::INPUT_POST, true);
	$reasons = rcube_utils::get_input_value('_action_reason', rcube_utils::INPUT_POST, true);
	$addresses = rcube_utils::get_input_value('_action_addresses', rcube_utils::INPUT_POST, true);
	$intervals = rcube_utils::get_input_value('_action_interval', rcube_utils::INPUT_POST);
	$interval_types = rcube_utils::get_input_value('_action_interval_type', rcube_utils::INPUT_POST);
	$from = rcube_utils::get_input_value('_action_from', rcube_utils::INPUT_POST);
	$subject = rcube_utils::get_input_value('_action_subject', rcube_utils::INPUT_POST, true);
	$flags = rcube_utils::get_input_value('_action_flags', rcube_utils::INPUT_POST);
	$varnames = rcube_utils::get_input_value('_action_varname', rcube_utils::INPUT_POST);
	$varvalues = rcube_utils::get_input_value('_action_varvalue', rcube_utils::INPUT_POST);
	$varmods = rcube_utils::get_input_value('_action_varmods', rcube_utils::INPUT_POST);
	$notifymethods = rcube_utils::get_input_value('_action_notifymethod', rcube_utils::INPUT_POST);
	$notifytargets = rcube_utils::get_input_value('_action_notifytarget', rcube_utils::INPUT_POST, true);
	$notifyoptions = rcube_utils::get_input_value('_action_notifyoption', rcube_utils::INPUT_POST, true);
	$notifymessages = rcube_utils::get_input_value('_action_notifymessage', rcube_utils::INPUT_POST, true);
	$notifyfrom = rcube_utils::get_input_value('_action_notifyfrom', rcube_utils::INPUT_POST);
	$notifyimp = rcube_utils::get_input_value('_action_notifyimportance', rcube_utils::INPUT_POST);

	// we need a "hack" for radiobuttons
	foreach ($sizeitems as $item)
	$items[] = $item;

	$this->form['disabled'] = !empty($_POST['_disabled']);
	$this->form['join'] = $join == 'allof';
	$this->form['name'] = $name;
	$this->form['tests'] = array();
	$this->form['actions'] = array();

	if ($name == '')
	$this->errors['name'] = $this->plugin->gettext('cannotbeempty');
	else {
	foreach($this->script as $idx => $rule)
	if($rule['name'] == $name && $idx != $fid) {
	$this->errors['name'] = $this->plugin->gettext('ruleexist');
	break;
	}
	}

	$i = 0;
	// rules
	if ($join == 'any') {
	$this->form['tests'][0]['test'] = 'true';
	}
	else {
	foreach ($headers as $idx => $header) {
	// targets are indexed differently (assume form order)
	$target = $this->strip_value(array_shift($targets), true);
	$header = $this->strip_value($header);
	$operator = $this->strip_value($ops[$idx]);
	$comparator = $this->strip_value($comparators[$idx]);

	if ($header == 'size') {
	$sizeop = $this->strip_value($sizeops[$idx]);
	$sizeitem = $this->strip_value($items[$idx]);
	$sizetarget = $this->strip_value($sizetargets[$idx]);

	$this->form['tests'][$i]['test'] = 'size';
	$this->form['tests'][$i]['type'] = $sizeop;
	$this->form['tests'][$i]['arg'] = $sizetarget;

	if ($sizetarget == '')
	$this->errors['tests'][$i]['sizetarget'] = $this->plugin->gettext('cannotbeempty');
	else if (!preg_match('/^[0-9]+(K\|M\|G)?$/i', $sizetarget.$sizeitem, $m)) {
	$this->errors['tests'][$i]['sizetarget'] = $this->plugin->gettext('forbiddenchars');
	$this->form['tests'][$i]['item'] = $sizeitem;
	}
	else
	$this->form['tests'][$i]['arg'] .= $m[1];
	}
	else if ($header == 'currentdate') {
	$datepart = $this->strip_value($dateparts[$idx]);

	if (preg_match('/^not/', $operator))
	$this->form['tests'][$i]['not'] = true;
	$type = preg_replace('/^not/', '', $operator);

	if ($type == 'exists') {
	$this->errors['tests'][$i]['op'] = true;
	}

	$this->form['tests'][$i]['test'] = 'currentdate';
	$this->form['tests'][$i]['type'] = $type;
	$this->form['tests'][$i]['part'] = $datepart;
	$this->form['tests'][$i]['arg'] = $target;

	if ($type != 'exists') {
	if (!count($target)) {
	$this->errors['tests'][$i]['target'] = $this->plugin->gettext('cannotbeempty');
	}
	else if (strpos($type, 'count-') === 0) {
	foreach ($target as $arg) {
	if (preg_match('/[^0-9]/', $arg)) {
	$this->errors['tests'][$i]['target'] = $this->plugin->gettext('forbiddenchars');
	}
	}
	}
	else if (strpos($type, 'value-') === 0) {
	// Some date/time formats do not support i;ascii-numeric comparator
	if ($comparator == 'i;ascii-numeric' && in_array($datepart, array('date', 'time', 'iso8601', 'std11'))) {
	$comparator = '';
	}
	}

	if (!preg_match('/^(regex\|matches\|count-)/', $type) && count($target)) {
	foreach ($target as $arg) {
	if (!$this->validate_date_part($datepart, $arg)) {
	$this->errors['tests'][$i]['target'] = $this->plugin->gettext('invaliddateformat');
	break;
	}
	}
	}
	}
	}
	else if ($header == 'date') {
	$datepart = $this->strip_value($dateparts[$idx]);
	$dateheader = $this->strip_value($dateheaders[$idx]);
	$index = $this->strip_value($indexes[$idx]);
	$indexlast = $this->strip_value($lastindexes[$idx]);

	if (preg_match('/^not/', $operator))
	$this->form['tests'][$i]['not'] = true;
	$type = preg_replace('/^not/', '', $operator);

	if ($type == 'exists') {
	$this->errors['tests'][$i]['op'] = true;
	}

	if (!empty($index) && $mod != 'envelope') {
	$this->form['tests'][$i]['index'] = intval($index);
	$this->form['tests'][$i]['last'] = !empty($indexlast);
	}

	if (empty($dateheader)) {
	$dateheader = 'Date';
	}
	else if (!preg_match('/^[\x21-\x39\x41-\x7E]+$/i', $dateheader)) {
	$this->errors['tests'][$i]['dateheader'] = $this->plugin->gettext('forbiddenchars');
	}

	$this->form['tests'][$i]['test'] = 'date';
	$this->form['tests'][$i]['type'] = $type;
	$this->form['tests'][$i]['part'] = $datepart;
	$this->form['tests'][$i]['arg'] = $target;
	$this->form['tests'][$i]['header'] = $dateheader;

	if ($type != 'exists') {
	if (!count($target)) {
	$this->errors['tests'][$i]['target'] = $this->plugin->gettext('cannotbeempty');
	}
	else if (strpos($type, 'count-') === 0) {
	foreach ($target as $arg) {
	if (preg_match('/[^0-9]/', $arg)) {
	$this->errors['tests'][$i]['target'] = $this->plugin->gettext('forbiddenchars');
	}
	}
	}
	else if (strpos($type, 'value-') === 0) {
	// Some date/time formats do not support i;ascii-numeric comparator
	if ($comparator == 'i;ascii-numeric' && in_array($datepart, array('date', 'time', 'iso8601', 'std11'))) {
	$comparator = '';
	}
	}

	if (count($target) && !preg_match('/^(regex\|matches\|count-)/', $type)) {
	foreach ($target as $arg) {
	if (!$this->validate_date_part($datepart, $arg)) {
	$this->errors['tests'][$i]['target'] = $this->plugin->gettext('invaliddateformat');
	break;
	}
	}
	}
	}
	}
	else if ($header == 'body') {
	$trans = $this->strip_value($body_trans[$idx]);
	$trans_type = $this->strip_value($body_types[$idx], true);

	if (preg_match('/^not/', $operator))
	$this->form['tests'][$i]['not'] = true;
	$type = preg_replace('/^not/', '', $operator);

	if ($type == 'exists') {
	$this->errors['tests'][$i]['op'] = true;
	}

	$this->form['tests'][$i]['test'] = 'body';
	$this->form['tests'][$i]['type'] = $type;
	$this->form['tests'][$i]['arg'] = $target;

	if (empty($target) && $type != 'exists') {
	$this->errors['tests'][$i]['target'] = $this->plugin->gettext('cannotbeempty');
	}
	else if (preg_match('/^(value\|count)-/', $type)) {
	foreach ($target as $target_value) {
	if (preg_match('/[^0-9]/', $target_value)) {
	$this->errors['tests'][$i]['target'] = $this->plugin->gettext('forbiddenchars');
	}
	}
	}

	$this->form['tests'][$i]['part'] = $trans;
	if ($trans == 'content') {
	$this->form['tests'][$i]['content'] = $trans_type;
	}
	}
	else if ($header == 'message') {
	$test = $this->strip_value($message[$idx]);

	if (preg_match('/^not/', $test)) {
	$this->form['tests'][$i]['not'] = true;
	$test = substr($test, 3);
	}

	$this->form['tests'][$i]['test'] = $test;

	if ($test == 'duplicate') {
	$this->form['tests'][$i]['last'] = !empty($dup_lasts[$idx]);
	$this->form['tests'][$i]['handle'] = trim($dup_handles[$idx]);
	$this->form['tests'][$i]['header'] = trim($dup_headers[$idx]);
	$this->form['tests'][$i]['uniqueid'] = trim($dup_uniqueids[$idx]);
	$this->form['tests'][$i]['seconds'] = trim($dup_seconds[$idx]);

	if ($this->form['tests'][$i]['seconds']
	&& preg_match('/[^0-9]/', $this->form['tests'][$i]['seconds'])
	) {
	$this->errors['tests'][$i]['duplicate_seconds'] = $this->plugin->gettext('forbiddenchars');
	}

	if ($this->form['tests'][$i]['header'] && $this->form['tests'][$i]['uniqueid']) {
	$this->errors['tests'][$i]['duplicate_uniqueid'] = $this->plugin->gettext('duplicate.conflict.err');
	}
	}
	}
	else {
	$cust_header = $headers = $this->strip_value(array_shift($cust_headers));
	$mod = $this->strip_value($mods[$idx]);
	$mod_type = $this->strip_value($mod_types[$idx]);
	$index = $this->strip_value($indexes[$idx]);
	$indexlast = $this->strip_value($lastindexes[$idx]);

	+ if ($header == 'string') {
	+ $cust_var = $headers = $this->strip_value(array_shift($cust_vars));
	+ }
	+
	if (preg_match('/^not/', $operator))
	$this->form['tests'][$i]['not'] = true;
	$type = preg_replace('/^not/', '', $operator);

	if (!empty($index) && $mod != 'envelope') {
	$this->form['tests'][$i]['index'] = intval($index);
	$this->form['tests'][$i]['last'] = !empty($indexlast);
	}

	- if ($header == '...') {
	+ if ($header == '...' \|\| $header == 'string') {
	if (!count($headers))
	$this->errors['tests'][$i]['header'] = $this->plugin->gettext('cannotbeempty');
	- else {
	+ else if ($header == '...') {
	foreach ($headers as $hr) {
	// RFC2822: printable ASCII except colon
	if (!preg_match('/^[\x21-\x39\x41-\x7E]+$/i', $hr)) {
	$this->errors['tests'][$i]['header'] = $this->plugin->gettext('forbiddenchars');
	}
	}
	}

	if (empty($this->errors['tests'][$i]['header']))
	- $cust_header = (is_array($headers) && count($headers) == 1) ? $headers[0] : $headers;
	+ $cust_header = $cust_var = (is_array($headers) && count($headers) == 1) ? $headers[0] : $headers;
	}

	+ $test = $header == 'string' ? 'string' : 'header';
	+ $header = $header == 'string' ? $cust_var : $header;
	$header = $header == '...' ? $cust_header : $header;

	if (is_array($header)) {
	foreach ($header as $h_index => $val) {
	if (isset($this->headers[$val])) {
	$header[$h_index] = $this->headers[$val];
	}
	}
	}

	if ($type == 'exists') {
	$this->form['tests'][$i]['test'] = 'exists';
	$this->form['tests'][$i]['arg'] = $header;
	}
	else {
	- $test = 'header';
	-
	if ($mod == 'address' \|\| $mod == 'envelope') {
	$found = false;
	if (empty($this->errors['tests'][$i]['header'])) {
	foreach ((array)$header as $hdr) {
	if (!in_array(strtolower(trim($hdr)), $this->addr_headers))
	$found = true;
	}
	}
	if (!$found)
	$test = $mod;
	}

	$this->form['tests'][$i]['type'] = $type;
	$this->form['tests'][$i]['test'] = $test;
	$this->form['tests'][$i]['arg1'] = $header;
	$this->form['tests'][$i]['arg2'] = $target;

	if (empty($target)) {
	$this->errors['tests'][$i]['target'] = $this->plugin->gettext('cannotbeempty');
	}
	else if (preg_match('/^(value\|count)-/', $type)) {
	foreach ($target as $target_value) {
	if (preg_match('/[^0-9]/', $target_value)) {
	$this->errors['tests'][$i]['target'] = $this->plugin->gettext('forbiddenchars');
	}
	}
	}

	if ($mod) {
	$this->form['tests'][$i]['part'] = $mod_type;
	}
	}
	}

	if ($header != 'size' && $comparator) {
	$this->form['tests'][$i]['comparator'] = $comparator;
	}

	$i++;
	}
	}

	$i = 0;
	// actions
	foreach ($act_types as $idx => $type) {
	$type = $this->strip_value($type);

	switch ($type) {
	case 'fileinto':
	case 'fileinto_copy':
	$mailbox = $this->strip_value($mailboxes[$idx], false, false);
	$this->form['actions'][$i]['target'] = $this->mod_mailbox($mailbox, 'in');

	if ($type == 'fileinto_copy') {
	$type = 'fileinto';
	$this->form['actions'][$i]['copy'] = true;
	}
	break;

	case 'reject':
	case 'ereject':
	$target = $this->strip_value($area_targets[$idx]);
	$this->form['actions'][$i]['target'] = str_replace("\r\n", "\n", $target);

	// if ($target == '')
	// $this->errors['actions'][$i]['targetarea'] = $this->plugin->gettext('cannotbeempty');
	break;

	case 'redirect':
	case 'redirect_copy':
	$target = $this->strip_value($act_targets[$idx]);
	$domain = $this->strip_value($domain_targets[$idx]);

	// force one of the configured domains
	$domains = (array) $this->rc->config->get('managesieve_domains');
	if (!empty($domains) && !empty($target)) {
	if (!$domain \|\| !in_array($domain, $domains)) {
	$domain = $domains[0];
	}

	$target .= '@' . $domain;
	}

	$this->form['actions'][$i]['target'] = $target;

	if ($target == '')
	$this->errors['actions'][$i]['target'] = $this->plugin->gettext('cannotbeempty');
	else if (!rcube_utils::check_email($target))
	$this->errors['actions'][$i]['target'] = $this->plugin->gettext(!empty($domains) ? 'forbiddenchars' : 'noemailwarning');

	if ($type == 'redirect_copy') {
	$type = 'redirect';
	$this->form['actions'][$i]['copy'] = true;
	}

	break;

	case 'addflag':
	case 'setflag':
	case 'removeflag':
	$_target = array();
	if (empty($flags[$idx])) {
	$this->errors['actions'][$i]['target'] = $this->plugin->gettext('noflagset');
	}
	else {
	foreach ($flags[$idx] as $flag) {
	$_target[] = $this->strip_value($flag);
	}
	}
	$this->form['actions'][$i]['target'] = $_target;
	break;

	case 'vacation':
	$reason = $this->strip_value($reasons[$idx]);
	$interval_type = $interval_types[$idx] == 'seconds' ? 'seconds' : 'days';

	$this->form['actions'][$i]['reason'] = str_replace("\r\n", "\n", $reason);
	$this->form['actions'][$i]['from'] = $from[$idx];
	$this->form['actions'][$i]['subject'] = $subject[$idx];
	$this->form['actions'][$i]['addresses'] = array_shift($addresses);
	$this->form['actions'][$i][$interval_type] = $intervals[$idx];
	// @TODO: vacation :mime, :handle

	foreach ((array)$this->form['actions'][$i]['addresses'] as $aidx => $address) {
	$this->form['actions'][$i]['addresses'][$aidx] = $address = trim($address);

	if (empty($address)) {
	unset($this->form['actions'][$i]['addresses'][$aidx]);
	}
	else if (!rcube_utils::check_email($address)) {
	$this->errors['actions'][$i]['addresses'] = $this->plugin->gettext('noemailwarning');
	break;
	}
	}

	if (!empty($this->form['actions'][$i]['from']) && !rcube_utils::check_email($this->form['actions'][$i]['from'])) {
	$this->errors['actions'][$i]['from'] = $this->plugin->gettext('noemailwarning');
	}

	if ($this->form['actions'][$i]['reason'] == '')
	$this->errors['actions'][$i]['reason'] = $this->plugin->gettext('cannotbeempty');
	if ($this->form['actions'][$i][$interval_type] && !preg_match('/^[0-9]+$/', $this->form['actions'][$i][$interval_type]))
	$this->errors['actions'][$i]['interval'] = $this->plugin->gettext('forbiddenchars');
	break;

	case 'set':
	$this->form['actions'][$i]['name'] = $varnames[$idx];
	$this->form['actions'][$i]['value'] = $varvalues[$idx];
	foreach ((array)$varmods[$idx] as $v_m) {
	$this->form['actions'][$i][$v_m] = true;
	}

	if (empty($varnames[$idx])) {
	$this->errors['actions'][$i]['name'] = $this->plugin->gettext('cannotbeempty');
	}
	else if (!preg_match('/^[0-9a-z_]+$/i', $varnames[$idx])) {
	$this->errors['actions'][$i]['name'] = $this->plugin->gettext('forbiddenchars');
	}

	if (!isset($varvalues[$idx]) \|\| $varvalues[$idx] === '') {
	$this->errors['actions'][$i]['value'] = $this->plugin->gettext('cannotbeempty');
	}
	break;

	case 'notify':
	if (empty($notifymethods[$idx])) {
	$this->errors['actions'][$i]['method'] = $this->plugin->gettext('cannotbeempty');
	}
	if (empty($notifytargets[$idx])) {
	$this->errors['actions'][$i]['target'] = $this->plugin->gettext('cannotbeempty');
	}
	if (!empty($notifyfrom[$idx]) && !rcube_utils::check_email($notifyfrom[$idx])) {
	$this->errors['actions'][$i]['from'] = $this->plugin->gettext('noemailwarning');
	}

	// skip empty options
	foreach ((array)$notifyoptions[$idx] as $opt_idx => $opt) {
	if (!strlen(trim($opt))) {
	unset($notifyoptions[$idx][$opt_idx]);
	}
	}

	$this->form['actions'][$i]['method'] = $notifymethods[$idx] . ':' . $notifytargets[$idx];
	$this->form['actions'][$i]['options'] = $notifyoptions[$idx];
	$this->form['actions'][$i]['message'] = $notifymessages[$idx];
	$this->form['actions'][$i]['from'] = $notifyfrom[$idx];
	$this->form['actions'][$i]['importance'] = $notifyimp[$idx];
	break;
	}

	$this->form['actions'][$i]['type'] = $type;
	$i++;
	}

	if (!$this->errors && !$error) {
	// save the script
	if (!isset($this->script[$fid])) {
	$fid = $this->sieve->script->add_rule($this->form);
	$new = true;
	}
	else {
	$fid = $this->sieve->script->update_rule($fid, $this->form);
	}

	if ($fid !== false)
	$save = $this->save_script();

	if ($save && $fid !== false) {
	$this->rc->output->show_message('managesieve.filtersaved', 'confirmation');
	if ($this->rc->task != 'mail') {
	$this->rc->output->command('parent.managesieve_updatelist',
	isset($new) ? 'add' : 'update',
	array(
	'name' => $this->form['name'],
	'id' => $fid,
	'disabled' => $this->form['disabled']
	));
	}
	else {
	$this->rc->output->command('managesieve_dialog_close');
	$this->rc->output->send('iframe');
	}
	}
	else {
	$this->rc->output->show_message('managesieve.filtersaveerror', 'error');
	// $this->rc->output->send();
	}
	}
	else {
	$this->rc->output->show_message('managesieve.filterformerror', 'warning');
	}
	}

	$this->send();
	}

	protected function send()
	{
	// Handle form action
	if (isset($_GET['_framed']) \|\| isset($_POST['_framed'])) {
	if (isset($_GET['_newset']) \|\| isset($_POST['_newset'])) {
	$this->rc->output->send('managesieve.setedit');
	}
	else {
	$this->rc->output->send('managesieve.filteredit');
	}
	}
	else {
	$this->rc->output->set_pagetitle($this->plugin->gettext('filters'));
	$this->rc->output->send('managesieve.managesieve');
	}
	}

	// return the filters list as HTML table
	function filters_list($attrib)
	{
	// add id to message list table if not specified
	if (!strlen($attrib['id']))
	$attrib['id'] = 'rcmfilterslist';

	// define list of cols to be displayed
	$a_show_cols = array('name');

	$result = $this->list_rules();

	// create XHTML table
	$out = $this->rc->table_output($attrib, $result, $a_show_cols, 'id');

	// set client env
	$this->rc->output->add_gui_object('filterslist', $attrib['id']);
	$this->rc->output->include_script('list.js');

	// add some labels to client
	$this->rc->output->add_label('managesieve.filterdeleteconfirm');

	return $out;
	}

	// return the filters list as <SELECT>
	function filtersets_list($attrib, $no_env = false)
	{
	// add id to message list table if not specified
	if (!strlen($attrib['id']))
	$attrib['id'] = 'rcmfiltersetslist';

	$list = $this->list_scripts();

	if ($list) {
	asort($list, SORT_LOCALE_STRING);
	}

	if (!empty($attrib['type']) && $attrib['type'] == 'list') {
	// define list of cols to be displayed
	$a_show_cols = array('name');

	if ($list) {
	foreach ($list as $idx => $set) {
	$scripts['S'.$idx] = $set;
	$result[] = array(
	'name' => $set,
	'id' => 'S'.$idx,
	'class' => !in_array($set, $this->active) ? 'disabled' : '',
	);
	}
	}

	// create XHTML table
	$out = $this->rc->table_output($attrib, $result, $a_show_cols, 'id');

	$this->rc->output->set_env('filtersets', $scripts);
	$this->rc->output->include_script('list.js');
	}
	else {
	$select = new html_select(array('name' => '_set', 'id' => $attrib['id'],
	'onchange' => $this->rc->task != 'mail' ? 'rcmail.managesieve_set()' : ''));

	if ($list) {
	foreach ($list as $set)
	$select->add($set, $set);
	}

	$out = $select->show($this->sieve->current);
	}

	// set client env
	if (!$no_env) {
	$this->rc->output->add_gui_object('filtersetslist', $attrib['id']);
	$this->rc->output->add_label('managesieve.setdeleteconfirm');
	}

	return $out;
	}

	function filter_frame($attrib)
	{
	return $this->rc->output->frame($attrib, true);
	}

	function filterset_form($attrib)
	{
	if (!$attrib['id'])
	$attrib['id'] = 'rcmfiltersetform';

	$out = '<form name="filtersetform" action="./" method="post" enctype="multipart/form-data">'."\n";

	$hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $this->rc->task));
	$hiddenfields->add(array('name' => '_action', 'value' => 'plugin.managesieve-save'));
	$hiddenfields->add(array('name' => '_framed', 'value' => ($_POST['_framed'] \|\| $_GET['_framed'] ? 1 : 0)));
	$hiddenfields->add(array('name' => '_newset', 'value' => 1));

	$out .= $hiddenfields->show();

	$name = rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST);
	$copy = rcube_utils::get_input_value('_copy', rcube_utils::INPUT_POST);
	$selected = rcube_utils::get_input_value('_from', rcube_utils::INPUT_POST);

	// filter set name input
	$input_name = new html_inputfield(array('name' => '_name', 'id' => '_name', 'size' => 30,
	'class' => ($this->errors['name'] ? 'error' : '')));

	$out .= sprintf('<label for="%s"><b>%s:</b></label> %s<br /><br />',
	'_name', rcube::Q($this->plugin->gettext('filtersetname')), $input_name->show($name));

	$out .="\n<fieldset class=\"itemlist\"><legend>" . $this->plugin->gettext('filters') . ":</legend>\n";
	$out .= '<input type="radio" id="from_none" name="_from" value="none"'
	.(!$selected \|\| $selected=='none' ? ' checked="checked"' : '').'></input>';
	$out .= sprintf('<label for="%s">%s</label> ', 'from_none', rcube::Q($this->plugin->gettext('none')));

	// filters set list
	$list = $this->list_scripts();
	$select = new html_select(array('name' => '_copy', 'id' => '_copy'));

	if (is_array($list)) {
	asort($list, SORT_LOCALE_STRING);

	if (!$copy)
	$copy = $_SESSION['managesieve_current'];

	foreach ($list as $set) {
	$select->add($set, $set);
	}

	$out .= '<br /><input type="radio" id="from_set" name="_from" value="set"'
	.($selected=='set' ? ' checked="checked"' : '').'></input>';
	$out .= sprintf('<label for="%s">%s:</label> ', 'from_set', rcube::Q($this->plugin->gettext('fromset')));
	$out .= $select->show($copy);
	}

	// script upload box
	$upload = new html_inputfield(array('name' => '_file', 'id' => '_file', 'size' => 30,
	'type' => 'file', 'class' => ($this->errors['file'] ? 'error' : '')));

	$out .= '<br /><input type="radio" id="from_file" name="_from" value="file"'
	.($selected=='file' ? ' checked="checked"' : '').'></input>';
	$out .= sprintf('<label for="%s">%s:</label> ', 'from_file', rcube::Q($this->plugin->gettext('fromfile')));
	$out .= $upload->show();
	$out .= '</fieldset>';

	$this->rc->output->add_gui_object('sieveform', 'filtersetform');

	if ($this->errors['name'])
	$this->add_tip('_name', $this->errors['name'], true);
	if ($this->errors['file'])
	$this->add_tip('_file', $this->errors['file'], true);

	$this->print_tips();

	return $out;
	}


	function filter_form($attrib)
	{
	if (!$attrib['id'])
	$attrib['id'] = 'rcmfilterform';

	$fid = rcube_utils::get_input_value('_fid', rcube_utils::INPUT_GPC);
	$scr = isset($this->form) ? $this->form : $this->script[$fid];

	$hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $this->rc->task));
	$hiddenfields->add(array('name' => '_action', 'value' => 'plugin.managesieve-save'));
	$hiddenfields->add(array('name' => '_framed', 'value' => ($_POST['_framed'] \|\| $_GET['_framed'] ? 1 : 0)));
	$hiddenfields->add(array('name' => '_fid', 'value' => $fid));

	$out = '<form name="filterform" action="./" method="post">'."\n";
	$out .= $hiddenfields->show();

	// 'any' flag
	if ((!isset($this->form) && empty($scr['tests']) && !empty($scr))
	\|\| (sizeof($scr['tests']) == 1 && $scr['tests'][0]['test'] == 'true' && !$scr['tests'][0]['not'])
	) {
	$any = true;
	}

	// filter name input
	$field_id = '_name';
	$input_name = new html_inputfield(array('name' => '_name', 'id' => $field_id, 'size' => 30,
	'class' => ($this->errors['name'] ? 'error' : '')));

	if ($this->errors['name'])
	$this->add_tip($field_id, $this->errors['name'], true);

	if (isset($scr))
	$input_name = $input_name->show($scr['name']);
	else
	$input_name = $input_name->show();

	$out .= sprintf("\n<label for=\"%s\"><b>%s:</b></label> %s\n",
	$field_id, rcube::Q($this->plugin->gettext('filtername')), $input_name);

	// filter set selector
	if ($this->rc->task == 'mail') {
	$out .= sprintf("\n <label for=\"%s\"><b>%s:</b></label> %s\n",
	$field_id, rcube::Q($this->plugin->gettext('filterset')),
	$this->filtersets_list(array('id' => 'sievescriptname'), true));
	}

	$out .= '<br /><br /><fieldset><legend>' . rcube::Q($this->plugin->gettext('messagesrules')) . "</legend>\n";

	// any, allof, anyof radio buttons
	$field_id = '_allof';
	$input_join = new html_radiobutton(array('name' => '_join', 'id' => $field_id, 'value' => 'allof',
	'onclick' => 'rule_join_radio(\'allof\')', 'class' => 'radio'));

	if (isset($scr) && !$any)
	$input_join = $input_join->show($scr['join'] ? 'allof' : '');
	else
	$input_join = $input_join->show();

	$out .= sprintf("%s<label for=\"%s\">%s</label> \n",
	$input_join, $field_id, rcube::Q($this->plugin->gettext('filterallof')));

	$field_id = '_anyof';
	$input_join = new html_radiobutton(array('name' => '_join', 'id' => $field_id, 'value' => 'anyof',
	'onclick' => 'rule_join_radio(\'anyof\')', 'class' => 'radio'));

	if (isset($scr) && !$any)
	$input_join = $input_join->show($scr['join'] ? '' : 'anyof');
	else
	$input_join = $input_join->show('anyof'); // default

	$out .= sprintf("%s<label for=\"%s\">%s</label>\n",
	$input_join, $field_id, rcube::Q($this->plugin->gettext('filteranyof')));

	$field_id = '_any';
	$input_join = new html_radiobutton(array('name' => '_join', 'id' => $field_id, 'value' => 'any',
	'onclick' => 'rule_join_radio(\'any\')', 'class' => 'radio'));

	$input_join = $input_join->show($any ? 'any' : '');

	$out .= sprintf("%s<label for=\"%s\">%s</label>\n",
	$input_join, $field_id, rcube::Q($this->plugin->gettext('filterany')));

	$rows_num = !empty($scr['tests']) ? sizeof($scr['tests']) : 1;

	$out .= '<div id="rules"'.($any ? ' style="display: none"' : '').'>';
	for ($x=0; $x<$rows_num; $x++)
	$out .= $this->rule_div($fid, $x);
	$out .= "</div>\n";

	$out .= "</fieldset>\n";

	// actions
	$out .= '<fieldset><legend>' . rcube::Q($this->plugin->gettext('messagesactions')) . "</legend>\n";

	$rows_num = isset($scr) ? sizeof($scr['actions']) : 1;

	$out .= '<div id="actions">';
	for ($x=0; $x<$rows_num; $x++)
	$out .= $this->action_div($fid, $x);
	$out .= "</div>\n";

	$out .= "</fieldset>\n";

	$this->print_tips();

	if ($scr['disabled']) {
	$this->rc->output->set_env('rule_disabled', true);
	}
	$this->rc->output->add_label(
	'managesieve.ruledeleteconfirm',
	'managesieve.actiondeleteconfirm'
	);
	$this->rc->output->add_gui_object('sieveform', 'filterform');

	return $out;
	}

	function rule_div($fid, $id, $div=true)
	{
	$rule = isset($this->form) ? $this->form['tests'][$id] : $this->script[$fid]['tests'][$id];
	$rows_num = isset($this->form) ? sizeof($this->form['tests']) : sizeof($this->script[$fid]['tests']);

	// headers select
	$select_header = new html_select(array('name' => "_header[]", 'id' => 'header'.$id,
	'onchange' => 'rule_header_select(' .$id .')'));

	foreach ($this->headers as $index => $header) {
	$header = $this->rc->text_exists($index) ? $this->plugin->gettext($index) : $header;
	$select_header->add($header, $index);
	}
	$select_header->add($this->plugin->gettext('...'), '...');
	if (in_array('body', $this->exts)) {
	$select_header->add($this->plugin->gettext('body'), 'body');
	}
	+ if (in_array('variables', $this->exts)) {
	+ $select_header->add($this->plugin->gettext('string'), 'string');
	+ }
	$select_header->add($this->plugin->gettext('size'), 'size');
	if (in_array('date', $this->exts)) {
	$select_header->add($this->plugin->gettext('datetest'), 'date');
	$select_header->add($this->plugin->gettext('currdate'), 'currentdate');
	}
	if (in_array('duplicate', $this->exts)) {
	$select_header->add($this->plugin->gettext('message'), 'message');
	}

	if (isset($rule['test'])) {
	if (in_array($rule['test'], array('header', 'address', 'envelope'))) {
	if (is_array($rule['arg1']) && count($rule['arg1']) == 1) {
	$rule['arg1'] = $rule['arg1'][0];
	}

	$matches = ($header = strtolower($rule['arg1'])) && isset($this->headers[$header]);
	$test = $matches ? $header : '...';
	}
	else if ($rule['test'] == 'exists') {
	if (is_array($rule['arg']) && count($rule['arg']) == 1) {
	$rule['arg'] = $rule['arg'][0];
	}

	$matches = ($header = strtolower($rule['arg'])) && isset($this->headers[$header]);
	$test = $matches ? $header : '...';
	}
	- else if (in_array($rule['test'], array('size', 'body', 'date', 'currentdate'))) {
	+ else if (in_array($rule['test'], array('size', 'body', 'date', 'currentdate', 'string'))) {
	$test = $rule['test'];
	}
	else if (in_array($rule['test'], array('duplicate'))) {
	$test = 'message';
	}
	else if ($rule['test'] != 'true') {
	$test = '...';
	}
	}

	$aout = $select_header->show($test);

	// custom headers input
	if (isset($rule['test']) && in_array($rule['test'], array('header', 'address', 'envelope'))) {
	$custom = (array) $rule['arg1'];
	if (count($custom) == 1 && isset($this->headers[strtolower($custom[0])])) {
	unset($custom);
	}
	}
	+ else if (isset($rule['test']) && $rule['test'] == 'string') {
	+ $customv = (array) $rule['arg1'];
	+ if (count($customv) == 1 && isset($this->headers[strtolower($customv[0])])) {
	+ unset($customv);
	+ }
	+ }
	else if (isset($rule['test']) && $rule['test'] == 'exists') {
	$custom = (array) $rule['arg'];
	if (count($custom) == 1 && isset($this->headers[strtolower($custom[0])])) {
	unset($custom);
	}
	}

	+ // custom variable input
	$tout = $this->list_input($id, 'custom_header', $custom, isset($custom),
	$this->error_class($id, 'test', 'header', 'custom_header'), 15) . "\n";

	+ $tout .= $this->list_input($id, 'custom_var', $customv, isset($customv),
	+ $this->error_class($id, 'test', 'header', 'custom_var'), 15) . "\n";
	+
	// matching type select (operator)
	$select_op = new html_select(array('name' => "_rule_op[]", 'id' => 'rule_op'.$id,
	'style' => 'display:' .(!in_array($rule['test'], array('size', 'duplicate')) ? 'inline' : 'none'),
	'class' => 'operator_selector',
	'onchange' => 'rule_op_select(this, '.$id.')'));
	$select_op->add(rcube::Q($this->plugin->gettext('filtercontains')), 'contains');
	$select_op->add(rcube::Q($this->plugin->gettext('filternotcontains')), 'notcontains');
	$select_op->add(rcube::Q($this->plugin->gettext('filteris')), 'is');
	$select_op->add(rcube::Q($this->plugin->gettext('filterisnot')), 'notis');
	$select_op->add(rcube::Q($this->plugin->gettext('filterexists')), 'exists');
	$select_op->add(rcube::Q($this->plugin->gettext('filternotexists')), 'notexists');
	$select_op->add(rcube::Q($this->plugin->gettext('filtermatches')), 'matches');
	$select_op->add(rcube::Q($this->plugin->gettext('filternotmatches')), 'notmatches');
	if (in_array('regex', $this->exts)) {
	$select_op->add(rcube::Q($this->plugin->gettext('filterregex')), 'regex');
	$select_op->add(rcube::Q($this->plugin->gettext('filternotregex')), 'notregex');
	}
	if (in_array('relational', $this->exts)) {
	$select_op->add(rcube::Q($this->plugin->gettext('countisgreaterthan')), 'count-gt');
	$select_op->add(rcube::Q($this->plugin->gettext('countisgreaterthanequal')), 'count-ge');
	$select_op->add(rcube::Q($this->plugin->gettext('countislessthan')), 'count-lt');
	$select_op->add(rcube::Q($this->plugin->gettext('countislessthanequal')), 'count-le');
	$select_op->add(rcube::Q($this->plugin->gettext('countequals')), 'count-eq');
	$select_op->add(rcube::Q($this->plugin->gettext('countnotequals')), 'count-ne');
	$select_op->add(rcube::Q($this->plugin->gettext('valueisgreaterthan')), 'value-gt');
	$select_op->add(rcube::Q($this->plugin->gettext('valueisgreaterthanequal')), 'value-ge');
	$select_op->add(rcube::Q($this->plugin->gettext('valueislessthan')), 'value-lt');
	$select_op->add(rcube::Q($this->plugin->gettext('valueislessthanequal')), 'value-le');
	$select_op->add(rcube::Q($this->plugin->gettext('valueequals')), 'value-eq');
	$select_op->add(rcube::Q($this->plugin->gettext('valuenotequals')), 'value-ne');
	}

	$test = self::rule_test($rule);
	$target = '';

	// target(s) input
	- if (in_array($rule['test'], array('header', 'address', 'envelope'))) {
	+ if (in_array($rule['test'], array('header', 'address', 'envelope','string'))) {
	$target = $rule['arg2'];
	}
	else if (in_array($rule['test'], array('body', 'date', 'currentdate'))) {
	$target = $rule['arg'];
	}
	else if ($rule['test'] == 'size') {
	if (preg_match('/^([0-9]+)(K\|M\|G)?$/', $rule['arg'], $matches)) {
	$sizetarget = $matches[1];
	$sizeitem = $matches[2];
	}
	else {
	$sizetarget = $rule['arg'];
	$sizeitem = $rule['item'];
	}
	}

	// (current)date part select
	if (in_array('date', $this->exts) \|\| in_array('currentdate', $this->exts)) {
	$date_parts = array('date', 'iso8601', 'std11', 'julian', 'time',
	'year', 'month', 'day', 'hour', 'minute', 'second', 'weekday', 'zone');
	$select_dp = new html_select(array('name' => "_rule_date_part[]", 'id' => 'rule_date_part'.$id,
	'style' => in_array($rule['test'], array('currentdate', 'date')) && !preg_match('/^(notcount\|count)-/', $test) ? '' : 'display:none',
	'class' => 'datepart_selector',
	));

	foreach ($date_parts as $part) {
	$select_dp->add(rcube::Q($this->plugin->gettext($part)), $part);
	}

	$tout .= $select_dp->show($rule['test'] == 'currentdate' \|\| $rule['test'] == 'date' ? $rule['part'] : '');
	}

	// message test select (e.g. duplicate)
	if (in_array('duplicate', $this->exts)) {
	$select_msg = new html_select(array('name' => "_rule_message[]", 'id' => 'rule_message'.$id,
	'style' => in_array($rule['test'], array('duplicate')) ? '' : 'display:none',
	'class' => 'message_selector',
	));

	$select_msg->add(rcube::Q($this->plugin->gettext('duplicate')), 'duplicate');
	$select_msg->add(rcube::Q($this->plugin->gettext('notduplicate')), 'notduplicate');

	$tout .= $select_msg->show($test);
	}

	$tout .= $select_op->show($test);
	$tout .= $this->list_input($id, 'rule_target', $target,
	$rule['test'] != 'size' && $rule['test'] != 'exists' && $rule['test'] != 'duplicate',
	$this->error_class($id, 'test', 'target', 'rule_target')) . "\n";

	$select_size_op = new html_select(array('name' => "_rule_size_op[]", 'id' => 'rule_size_op'.$id));
	$select_size_op->add(rcube::Q($this->plugin->gettext('filterover')), 'over');
	$select_size_op->add(rcube::Q($this->plugin->gettext('filterunder')), 'under');

	$tout .= '<div id="rule_size' .$id. '" style="display:' . ($rule['test']=='size' ? 'inline' : 'none') .'">';
	$tout .= $select_size_op->show($rule['test']=='size' ? $rule['type'] : '');
	$tout .= '<input type="text" name="_rule_size_target[]" id="rule_size_i'.$id.'" value="'.$sizetarget.'" size="10" '
	. $this->error_class($id, 'test', 'sizetarget', 'rule_size_i') .' />
	<label><input type="radio" name="_rule_size_item['.$id.']" value=""'
	. (!$sizeitem ? ' checked="checked"' : '') .' class="radio" />'.$this->rc->gettext('B').'</label>
	<label><input type="radio" name="_rule_size_item['.$id.']" value="K"'
	. ($sizeitem=='K' ? ' checked="checked"' : '') .' class="radio" />'.$this->rc->gettext('KB').'</label>
	<label><input type="radio" name="_rule_size_item['.$id.']" value="M"'
	. ($sizeitem=='M' ? ' checked="checked"' : '') .' class="radio" />'.$this->rc->gettext('MB').'</label>
	<label><input type="radio" name="_rule_size_item['.$id.']" value="G"'
	. ($sizeitem=='G' ? ' checked="checked"' : '') .' class="radio" />'.$this->rc->gettext('GB').'</label>';
	$tout .= '</div>';

	// Advanced modifiers (address, envelope)
	$select_mod = new html_select(array('name' => "_rule_mod[]", 'id' => 'rule_mod_op'.$id,
	'onchange' => 'rule_mod_select(' .$id .')'));
	$select_mod->add(rcube::Q($this->plugin->gettext('none')), '');
	$select_mod->add(rcube::Q($this->plugin->gettext('address')), 'address');
	if (in_array('envelope', $this->exts)) {
	$select_mod->add(rcube::Q($this->plugin->gettext('envelope')), 'envelope');
	}

	$select_type = new html_select(array('name' => "_rule_mod_type[]", 'id' => 'rule_mod_type'.$id));
	$select_type->add(rcube::Q($this->plugin->gettext('allparts')), 'all');
	$select_type->add(rcube::Q($this->plugin->gettext('domain')), 'domain');
	$select_type->add(rcube::Q($this->plugin->gettext('localpart')), 'localpart');
	if (in_array('subaddress', $this->exts)) {
	$select_type->add(rcube::Q($this->plugin->gettext('user')), 'user');
	$select_type->add(rcube::Q($this->plugin->gettext('detail')), 'detail');
	}

	- $need_mod = !in_array($rule['test'], array('size', 'body', 'date', 'currentdate', 'duplicate'));
	+ $need_mod = !in_array($rule['test'], array('size', 'body', 'date', 'currentdate', 'duplicate', 'string'));
	$mout = '<div id="rule_mod' .$id. '" class="adv"' . (!$need_mod ? ' style="display:none"' : '') . '>';
	$mout .= ' <span class="label">' . rcube::Q($this->plugin->gettext('modifier')) . ' </span>';
	$mout .= $select_mod->show($rule['test']);
	$mout .= ' <span id="rule_mod_type' . $id . '"';
	$mout .= ' style="display:' . (in_array($rule['test'], array('address', 'envelope')) ? 'inline' : 'none') .'">';
	$mout .= rcube::Q($this->plugin->gettext('modtype')) . ' ';
	$mout .= $select_type->show($rule['part']);
	$mout .= '</span>';
	$mout .= '</div>';

	// Advanced modifiers (body transformations)
	$select_mod = new html_select(array('name' => "_rule_trans[]", 'id' => 'rule_trans_op'.$id,
	'onchange' => 'rule_trans_select(' .$id .')'));
	$select_mod->add(rcube::Q($this->plugin->gettext('text')), 'text');
	$select_mod->add(rcube::Q($this->plugin->gettext('undecoded')), 'raw');
	$select_mod->add(rcube::Q($this->plugin->gettext('contenttype')), 'content');

	$mout .= '<div id="rule_trans' .$id. '" class="adv"' . ($rule['test'] != 'body' ? ' style="display:none"' : '') . '>';
	$mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('modifier')) . '</span>';
	$mout .= $select_mod->show($rule['part']);
	$mout .= '<input type="text" name="_rule_trans_type[]" id="rule_trans_type'.$id
	. '" value="'.(is_array($rule['content']) ? implode(',', $rule['content']) : $rule['content'])
	.'" size="20"' . ($rule['part'] != 'content' ? ' style="display:none"' : '')
	. $this->error_class($id, 'test', 'part', 'rule_trans_type') .' />';
	$mout .= '</div>';

	// Advanced modifiers (body transformations)
	$select_comp = new html_select(array('name' => "_rule_comp[]", 'id' => 'rule_comp_op'.$id));
	$select_comp->add(rcube::Q($this->plugin->gettext('default')), '');
	$select_comp->add(rcube::Q($this->plugin->gettext('octet')), 'i;octet');
	$select_comp->add(rcube::Q($this->plugin->gettext('asciicasemap')), 'i;ascii-casemap');
	if (in_array('comparator-i;ascii-numeric', $this->exts)) {
	$select_comp->add(rcube::Q($this->plugin->gettext('asciinumeric')), 'i;ascii-numeric');
	}

	// Comparators
	$need_comp = $rule['test'] != 'size' && $rule['test'] != 'duplicate';
	$mout .= '<div id="rule_comp' .$id. '" class="adv"' . (!$need_comp ? ' style="display:none"' : '') . '>';
	$mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('comparator')) . '</span>';
	$mout .= $select_comp->show($rule['comparator']);
	$mout .= '</div>';

	// Date header
	if (in_array('date', $this->exts)) {
	$mout .= '<div id="rule_date_header_div' .$id. '" class="adv"'. ($rule['test'] != 'date' ? ' style="display:none"' : '') .'>';
	$mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('dateheader')) . '</span>';
	$mout .= '<input type="text" name="_rule_date_header[]" id="rule_date_header'.$id
	. '" value="'. rcube::Q($rule['test'] == 'date' ? $rule['header'] : '')
	. '" size="15"' . $this->error_class($id, 'test', 'dateheader', 'rule_date_header') .' />';
	$mout .= '</div>';
	}

	// Index
	if (in_array('index', $this->exts)) {
	$need_index = in_array($rule['test'], array('header', ', address', 'date'));
	$mout .= '<div id="rule_index_div' .$id. '" class="adv"'. (!$need_index ? ' style="display:none"' : '') .'>';
	$mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('index')) . '</span>';
	$mout .= '<input type="text" name="_rule_index[]" id="rule_index'.$id
	. '" value="'. ($rule['index'] ? intval($rule['index']) : '')
	. '" size="3"' . $this->error_class($id, 'test', 'index', 'rule_index') .' />';
	$mout .= ' <input type="checkbox" name="_rule_index_last[]" id="rule_index_last'.$id
	. '" value="1"' . (!empty($rule['last']) ? ' checked="checked"' : '') . ' />'
	. '<label for="rule_index_last'.$id.'">'.rcube::Q($this->plugin->gettext('indexlast')).'</label>';
	$mout .= '</div>';
	}

	// Duplicate
	if (in_array('duplicate', $this->exts)) {
	$need_duplicate = $rule['test'] == 'duplicate';
	$mout .= '<div id="rule_duplicate_div' .$id. '" class="adv"'. (!$need_duplicate ? ' style="display:none"' : '') .'>';
	$mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('duplicate.handle')) . '</span>';
	$mout .= '<input type="text" name="_rule_duplicate_handle[]" id="rule_duplicate_handle'.$id
	. '" value="'. ($rule['handle'] ? rcube::JQ($rule['handle']) : '')
	. '" size="30"' . $this->error_class($id, 'test', 'duplicate_handle', 'rule_duplicate_handle') .' /><br>';
	$mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('duplicate.header')) . '</span>';
	$mout .= '<input type="text" name="_rule_duplicate_header[]" id="rule_duplicate_header'.$id
	. '" value="'. ($rule['header'] ? rcube::JQ($rule['header']) : '')
	. '" size="30"' . $this->error_class($id, 'test', 'duplicate_header', 'rule_duplicate_header') .' /><br>';
	$mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('duplicate.uniqueid')) . '</span>';
	$mout .= '<input type="text" name="_rule_duplicate_uniqueid[]" id="rule_duplicate_uniqueid'.$id
	. '" value="'. ($rule['uniqueid'] ? rcube::JQ($rule['uniqueid']) : '')
	. '" size="30"' . $this->error_class($id, 'test', 'duplicate_uniqueid', 'rule_duplicate_uniqueid') .' /><br>';
	$mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('duplicate.seconds')) . '</span>';
	$mout .= '<input type="text" name="_rule_duplicate_seconds[]" id="rule_duplicate_seconds'.$id
	. '" value="'. rcube::JQ($rule['seconds'])
	. '" size="6"' . $this->error_class($id, 'test', 'duplicate_seconds', 'rule_duplicate_seconds') .' />';
	$mout .= ' <input type="checkbox" name="_rule_duplicate_last['.$id.']" id="rule_duplicate_last'.$id
	. '" value="1"' . (!empty($rule['last']) ? ' checked="checked"' : '') . ' />'
	. '<label for="rule_duplicate_last'.$id.'">'.rcube::Q($this->plugin->gettext('duplicate.last')).'</label>';
	$mout .= '</div>';
	}

	// Build output table
	$out = $div ? '<div class="rulerow" id="rulerow' .$id .'">'."\n" : '';
	$out .= '<table><tr>';
	$out .= '<td class="advbutton">';
	$out .= '<a href="#" id="ruleadv' . $id .'" title="'. rcube::Q($this->plugin->gettext('advancedopts')). '"
	onclick="rule_adv_switch(' . $id .', this)" class="show">  </a>';
	$out .= '</td>';
	$out .= '<td class="rowactions">' . $aout . '</td>';
	$out .= '<td class="rowtargets">' . $tout . "\n";
	$out .= '<div id="rule_advanced' .$id. '" style="display:none">' . $mout . '</div>';
	$out .= '</td>';

	// add/del buttons
	$out .= '<td class="rowbuttons">';
	$out .= '<a href="#" id="ruleadd' . $id .'" title="'. rcube::Q($this->plugin->gettext('add')). '"
	onclick="rcmail.managesieve_ruleadd(' . $id .')" class="button add"></a>';
	$out .= '<a href="#" id="ruledel' . $id .'" title="'. rcube::Q($this->plugin->gettext('del')). '"
	onclick="rcmail.managesieve_ruledel(' . $id .')" class="button del' . ($rows_num<2 ? ' disabled' : '') .'"></a>';
	$out .= '</td>';
	$out .= '</tr></table>';

	$out .= $div ? "</div>\n" : '';

	return $out;
	}

	private static function rule_test(&$rule)
	{
	// first modify value/count tests with 'not' keyword
	// we'll revert the meaning of operators
	if ($rule['not'] && preg_match('/^(count\|value)-([gteqnl]{2})/', $rule['type'], $m)) {
	$rule['not'] = false;

	switch ($m[2]) {
	case 'gt': $rule['type'] = $m[1] . '-le'; break;
	case 'ge': $rule['type'] = $m[1] . '-lt'; break;
	case 'lt': $rule['type'] = $m[1] . '-ge'; break;
	case 'le': $rule['type'] = $m[1] . '-gt'; break;
	case 'eq': $rule['type'] = $m[1] . '-ne'; break;
	case 'ne': $rule['type'] = $m[1] . '-eq'; break;
	}
	}
	else if ($rule['not'] && $rule['test'] == 'size') {
	$rule['not'] = false;
	$rule['type'] = $rule['type'] == 'over' ? 'under' : 'over';
	}

	- $set = array('header', 'address', 'envelope', 'body', 'date', 'currentdate');
	+ $set = array('header', 'address', 'envelope', 'body', 'date', 'currentdate', 'string');

	// build test string supported by select element
	if ($rule['size']) {
	$test = $rule['type'];
	}
	else if (in_array($rule['test'], $set)) {
	$test = ($rule['not'] ? 'not' : '') . ($rule['type'] ?: 'is');
	}
	else {
	$test = ($rule['not'] ? 'not' : '') . $rule['test'];
	}

	return $test;
	}

	function action_div($fid, $id, $div=true)
	{
	$action = isset($this->form) ? $this->form['actions'][$id] : $this->script[$fid]['actions'][$id];
	$rows_num = isset($this->form) ? sizeof($this->form['actions']) : sizeof($this->script[$fid]['actions']);

	$out = $div ? '<div class="actionrow" id="actionrow' .$id .'">'."\n" : '';

	$out .= '<table><tr><td class="rowactions">';

	// action select
	$select_action = new html_select(array('name' => "_action_type[$id]", 'id' => 'action_type'.$id,
	'onchange' => 'action_type_select(' .$id .')'));
	if (in_array('fileinto', $this->exts))
	$select_action->add(rcube::Q($this->plugin->gettext('messagemoveto')), 'fileinto');
	if (in_array('fileinto', $this->exts) && in_array('copy', $this->exts))
	$select_action->add(rcube::Q($this->plugin->gettext('messagecopyto')), 'fileinto_copy');
	$select_action->add(rcube::Q($this->plugin->gettext('messageredirect')), 'redirect');
	if (in_array('copy', $this->exts))
	$select_action->add(rcube::Q($this->plugin->gettext('messagesendcopy')), 'redirect_copy');
	if (in_array('reject', $this->exts))
	$select_action->add(rcube::Q($this->plugin->gettext('messagediscard')), 'reject');
	else if (in_array('ereject', $this->exts))
	$select_action->add(rcube::Q($this->plugin->gettext('messagediscard')), 'ereject');
	if (in_array('vacation', $this->exts))
	$select_action->add(rcube::Q($this->plugin->gettext('messagereply')), 'vacation');
	$select_action->add(rcube::Q($this->plugin->gettext('messagedelete')), 'discard');
	if (in_array('imapflags', $this->exts) \|\| in_array('imap4flags', $this->exts)) {
	$select_action->add(rcube::Q($this->plugin->gettext('setflags')), 'setflag');
	$select_action->add(rcube::Q($this->plugin->gettext('addflags')), 'addflag');
	$select_action->add(rcube::Q($this->plugin->gettext('removeflags')), 'removeflag');
	}
	if (in_array('variables', $this->exts)) {
	$select_action->add(rcube::Q($this->plugin->gettext('setvariable')), 'set');
	}
	if (in_array('enotify', $this->exts) \|\| in_array('notify', $this->exts)) {
	$select_action->add(rcube::Q($this->plugin->gettext('notify')), 'notify');
	}
	$select_action->add(rcube::Q($this->plugin->gettext('messagekeep')), 'keep');
	$select_action->add(rcube::Q($this->plugin->gettext('rulestop')), 'stop');

	$select_type = $action['type'];
	if (in_array($action['type'], array('fileinto', 'redirect')) && $action['copy']) {
	$select_type .= '_copy';
	}

	$out .= $select_action->show($select_type);
	$out .= '</td>';

	// actions target inputs
	$out .= '<td class="rowtargets">';

	// force domain selection in redirect email input
	$domains = (array) $this->rc->config->get('managesieve_domains');
	if (!empty($domains)) {
	sort($domains);

	$domain_select = new html_select(array('name' => "_action_target_domain[$id]", 'id' => 'action_target_domain'.$id));
	$domain_select->add(array_combine($domains, $domains));

	if ($action['type'] == 'redirect') {
	$parts = explode('@', $action['target']);
	if (!empty($parts)) {
	$action['domain'] = array_pop($parts);
	$action['target'] = implode('@', $parts);
	}
	}
	}

	// redirect target
	$out .= '<span id="redirect_target' . $id . '" style="white-space:nowrap;'
	. ' display:' . ($action['type'] == 'redirect' ? 'inline' : 'none') . '">'
	. '<input type="text" name="_action_target['.$id.']" id="action_target' .$id. '"'
	. ' value="' .($action['type'] == 'redirect' ? rcube::Q($action['target'], 'strict', false) : '') . '"'
	. (!empty($domains) ? ' size="20"' : ' size="35"')
	. $this->error_class($id, 'action', 'target', 'action_target') .' />'
	. (!empty($domains) ? ' @ ' . $domain_select->show($action['domain']) : '')
	. '</span>';

	// (e)reject target
	$out .= '<textarea name="_action_target_area['.$id.']" id="action_target_area' .$id. '" '
	.'rows="3" cols="35" '. $this->error_class($id, 'action', 'targetarea', 'action_target_area')
	.'style="display:' .(in_array($action['type'], array('reject', 'ereject')) ? 'inline' : 'none') .'">'
	. (in_array($action['type'], array('reject', 'ereject')) ? rcube::Q($action['target'], 'strict', false) : '')
	. "</textarea>\n";

	// vacation
	$vsec = in_array('vacation-seconds', $this->exts);
	$auto_addr = $this->rc->config->get('managesieve_vacation_addresses_init');
	$addresses = isset($action['addresses']) \|\| !$auto_addr ? (array) $action['addresses'] : $this->user_emails();

	$out .= '<div id="action_vacation' .$id.'" style="display:' .($action['type']=='vacation' ? 'inline' : 'none') .'">';
	$out .= '<span class="label">'. rcube::Q($this->plugin->gettext('vacationreason')) .'</span><br />'
	.'<textarea name="_action_reason['.$id.']" id="action_reason' .$id. '" '
	.'rows="3" cols="35" '. $this->error_class($id, 'action', 'reason', 'action_reason') . '>'
	. rcube::Q($action['reason'], 'strict', false) . "</textarea>\n";
	$out .= '<br /><span class="label">' .rcube::Q($this->plugin->gettext('vacationsubject')) . '</span><br />'
	.'<input type="text" name="_action_subject['.$id.']" id="action_subject'.$id.'" '
	.'value="' . (is_array($action['subject']) ? rcube::Q(implode(', ', $action['subject']), 'strict', false) : $action['subject']) . '" size="35" '
	. $this->error_class($id, 'action', 'subject', 'action_subject') .' />';
	$out .= '<br /><span class="label">' .rcube::Q($this->plugin->gettext('vacationfrom')) . '</span><br />'
	.'<input type="text" name="_action_from['.$id.']" id="action_from'.$id.'" '
	.'value="' . $action['from'] . '" size="35" '
	. $this->error_class($id, 'action', 'from', 'action_from') .' />';
	$out .= '<br /><span class="label">' .rcube::Q($this->plugin->gettext('vacationaddr')) . '</span><br />'
	. $this->list_input($id, 'action_addresses', $addresses, true,
	$this->error_class($id, 'action', 'addresses', 'action_addresses'), 30)
	. html::a(array('href' => '#', 'onclick' => rcmail_output::JS_OBJECT_NAME . ".managesieve_vacation_addresses($id)"),
	rcube::Q($this->plugin->gettext('filladdresses')));
	$out .= '<br /><span class="label">' . rcube::Q($this->plugin->gettext($vsec ? 'vacationinterval' : 'vacationdays')) . '</span><br />'
	.'<input type="text" name="_action_interval['.$id.']" id="action_interval'.$id.'" '
	.'value="' .rcube::Q(rcube_sieve_vacation::vacation_interval($action), 'strict', false) . '" size="2" '
	. $this->error_class($id, 'action', 'interval', 'action_interval') .' />';
	if ($vsec) {
	$out .= ' <label><input type="radio" name="_action_interval_type['.$id.']" value="days"'
	. (!isset($action['seconds']) ? ' checked="checked"' : '') .' class="radio" />'.$this->plugin->gettext('days').'</label>'
	. ' <label><input type="radio" name="_action_interval_type['.$id.']" value="seconds"'
	. (isset($action['seconds']) ? ' checked="checked"' : '') .' class="radio" />'.$this->plugin->gettext('seconds').'</label>';
	}
	$out .= '</div>';

	// flags
	$flags = array(
	'read' => '\\Seen',
	'answered' => '\\Answered',
	'flagged' => '\\Flagged',
	'deleted' => '\\Deleted',
	'draft' => '\\Draft',
	);
	$flags_target = (array)$action['target'];

	$out .= '<div id="action_flags' .$id.'" style="display:'
	. (preg_match('/^(set\|add\|remove)flag$/', $action['type']) ? 'inline' : 'none') . '"'
	. $this->error_class($id, 'action', 'flags', 'action_flags') . '>';
	foreach ($flags as $fidx => $flag) {
	$out .= '<input type="checkbox" name="_action_flags[' .$id .'][]" value="' . $flag . '"'
	. (in_array_nocase($flag, $flags_target) ? 'checked="checked"' : '') . ' />'
	. rcube::Q($this->plugin->gettext('flag'.$fidx)) .'<br>';
	}
	$out .= '</div>';

	// set variable
	$set_modifiers = array(
	'lower',
	'upper',
	'lowerfirst',
	'upperfirst',
	'quotewildcard',
	'length'
	);

	$out .= '<div id="action_set' .$id.'" style="display:' .($action['type']=='set' ? 'inline' : 'none') .'">';
	$out .= '<span class="label">' .rcube::Q($this->plugin->gettext('setvarname')) . '</span><br />'
	.'<input type="text" name="_action_varname['.$id.']" id="action_varname'.$id.'" '
	.'value="' . rcube::Q($action['name']) . '" size="35" '
	. $this->error_class($id, 'action', 'name', 'action_varname') .' />';
	$out .= '<br /><span class="label">' .rcube::Q($this->plugin->gettext('setvarvalue')) . '</span><br />'
	.'<input type="text" name="_action_varvalue['.$id.']" id="action_varvalue'.$id.'" '
	.'value="' . rcube::Q($action['value']) . '" size="35" '
	. $this->error_class($id, 'action', 'value', 'action_varvalue') .' />';
	$out .= '<br /><span class="label">' .rcube::Q($this->plugin->gettext('setvarmodifiers')) . '</span><br />';
	foreach ($set_modifiers as $s_m) {
	$s_m_id = 'action_varmods' . $id . $s_m;
	$out .= sprintf('<input type="checkbox" name="_action_varmods[%s][]" value="%s" id="%s"%s />%s<br>',
	$id, $s_m, $s_m_id,
	(array_key_exists($s_m, (array)$action) && $action[$s_m] ? ' checked="checked"' : ''),
	rcube::Q($this->plugin->gettext('var' . $s_m)));
	}
	$out .= '</div>';

	// notify
	$notify_methods = (array) $this->rc->config->get('managesieve_notify_methods');
	$importance_options = $this->notify_importance_options;

	if (empty($notify_methods)) {
	$notify_methods = $this->notify_methods;
	}

	list($method, $target) = explode(':', $action['method'], 2);
	$method = strtolower($method);

	if ($method && !in_array($method, $notify_methods)) {
	$notify_methods[] = $method;
	}

	$select_method = new html_select(array(
	'name' => "_action_notifymethod[$id]",
	'id' => "_action_notifymethod$id",
	'class' => $this->error_class($id, 'action', 'method', 'action_notifymethod'),
	));
	foreach ($notify_methods as $m_n) {
	$select_method->add(rcube::Q($this->rc->text_exists('managesieve.notifymethod'.$m_n) ? $this->plugin->gettext('managesieve.notifymethod'.$m_n) : $m_n), $m_n);
	}

	$select_importance = new html_select(array(
	'name' => "_action_notifyimportance[$id]",
	'id' => "_action_notifyimportance$id",
	'class' => $this->error_class($id, 'action', 'importance', 'action_notifyimportance')
	));
	foreach ($importance_options as $io_v => $io_n) {
	$select_importance->add(rcube::Q($this->plugin->gettext($io_n)), $io_v);
	}

	// @TODO: nice UI for mailto: (other methods too) URI parameters
	$out .= '<div id="action_notify' .$id.'" style="display:' .($action['type'] == 'notify' ? 'inline' : 'none') .'">';
	$out .= '<span class="label">' .rcube::Q($this->plugin->gettext('notifytarget')) . '</span><br />'
	. $select_method->show($method)
	.'<input type="text" name="_action_notifytarget['.$id.']" id="action_notifytarget'.$id.'" '
	.'value="' . rcube::Q($target) . '" size="25" '
	. $this->error_class($id, 'action', 'target', 'action_notifytarget') .' />';
	$out .= '<br /><span class="label">'. rcube::Q($this->plugin->gettext('notifymessage')) .'</span><br />'
	.'<textarea name="_action_notifymessage['.$id.']" id="action_notifymessage' .$id. '" '
	.'rows="3" cols="35" '. $this->error_class($id, 'action', 'message', 'action_notifymessage') . '>'
	. rcube::Q($action['message'], 'strict', false) . "</textarea>\n";
	if (in_array('enotify', $this->exts)) {
	$out .= '<br /><span class="label">' .rcube::Q($this->plugin->gettext('notifyfrom')) . '</span><br />'
	.'<input type="text" name="_action_notifyfrom['.$id.']" id="action_notifyfrom'.$id.'" '
	.'value="' . rcube::Q($action['from']) . '" size="35" '
	. $this->error_class($id, 'action', 'from', 'action_notifyfrom') .' />';
	}
	$out .= '<br /><span class="label">' . rcube::Q($this->plugin->gettext('notifyimportance')) . '</span><br />';
	$out .= $select_importance->show($action['importance'] ? (int) $action['importance'] : 2);
	$out .= '<div id="action_notifyoption_div' . $id . '">'
	.'<span class="label">' . rcube::Q($this->plugin->gettext('notifyoptions')) . '</span><br />'
	.$this->list_input($id, 'action_notifyoption', (array)$action['options'], true,
	$this->error_class($id, 'action', 'options', 'action_notifyoption'), 30) . '</div>';
	$out .= '</div>';

	// mailbox select
	if ($action['type'] == 'fileinto') {
	$mailbox = $this->mod_mailbox($action['target'], 'out');
	// make sure non-existing (or unsubscribed) mailbox is listed (#1489956)
	$additional = array($mailbox);
	}
	else {
	$mailbox = '';
	}

	$select = $this->rc->folder_selector(array(
	'realnames' => false,
	'maxlength' => 100,
	'id' => 'action_mailbox' . $id,
	'name' => "_action_mailbox[$id]",
	'style' => 'display:'.(empty($action['type']) \|\| $action['type'] == 'fileinto' ? 'inline' : 'none'),
	'additional' => $additional,
	));
	$out .= $select->show($mailbox);
	$out .= '</td>';

	// add/del buttons
	$out .= '<td class="rowbuttons">';
	$out .= '<a href="#" id="actionadd' . $id .'" title="'. rcube::Q($this->plugin->gettext('add')). '"
	onclick="rcmail.managesieve_actionadd(' . $id .')" class="button add"></a>';
	$out .= '<a href="#" id="actiondel' . $id .'" title="'. rcube::Q($this->plugin->gettext('del')). '"
	onclick="rcmail.managesieve_actiondel(' . $id .')" class="button del' . ($rows_num<2 ? ' disabled' : '') .'"></a>';
	$out .= '</td>';

	$out .= '</tr></table>';

	$out .= $div ? "</div>\n" : '';

	return $out;
	}

	protected function genid()
	{
	return preg_replace('/[^0-9]/', '', microtime(true));
	}

	protected function strip_value($str, $allow_html = false, $trim = true)
	{
	if (is_array($str)) {
	foreach ($str as $idx => $val) {
	$val = $this->strip_value($val, $allow_html, $trim);

	if ($val === '') {
	unset($str[$idx]);
	}
	}

	return $str;
	}

	if (!$allow_html) {
	$str = strip_tags($str);
	}

	return $trim ? trim($str) : $str;
	}

	protected function error_class($id, $type, $target, $elem_prefix='')
	{
	// TODO: tooltips
	if (($type == 'test' && ($str = $this->errors['tests'][$id][$target])) \|\|
	($type == 'action' && ($str = $this->errors['actions'][$id][$target]))
	) {
	$this->add_tip($elem_prefix.$id, $str, true);
	return ' class="error"';
	}

	return '';
	}

	protected function add_tip($id, $str, $error=false)
	{
	if ($error)
	$str = html::span('sieve error', $str);

	$this->tips[] = array($id, $str);
	}

	protected function print_tips()
	{
	if (empty($this->tips))
	return;

	$script = rcmail_output::JS_OBJECT_NAME.'.managesieve_tip_register('.json_encode($this->tips).');';
	$this->rc->output->add_script($script, 'foot');
	}

	protected function list_input($id, $name, $value, $enabled, $class, $size=null)
	{
	$value = (array) $value;
	$value = array_map(array('rcube', 'Q'), $value);
	$value = implode("\n", $value);

	return '<textarea data-type="list" name="_' . $name . '['.$id.']" id="' . $name.$id . '"'
	. ($enabled ? '' : ' disabled="disabled"')
	. ($size ? ' data-size="'.$size.'"' : '')
	. $class
	. ' style="display:none">' . $value . '</textarea>';
	}

	/**
	* Validate input for date part elements
	*/
	protected function validate_date_part($type, $value)
	{
	// we do simple validation of date/part format
	switch ($type) {
	case 'date': // yyyy-mm-dd
	return preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $value);
	case 'iso8601':
	return preg_match('/^[0-9: .,ZWT+-]+$/', $value);
	case 'std11':
	return preg_match('/^((Sun\|Mon\|Tue\|Wed\|Thu\|Fri\|Sat),\s+)?[0-9]{1,2}\s+'
	. '(Jan\|Feb\|Mar\|Apr\|May\|Jun\|Jul\|Aug\|Sep\|Oct\|Nov\|Dec)\s+[0-9]{2,4}\s+'
	. '[0-9]{2}:[0-9]{2}(:[0-9]{2})?\s+([+-]*[0-9]{4}\|[A-Z]{1,3})$', $value);
	case 'julian':
	return preg_match('/^[0-9]+$/', $value);
	case 'time': // hh:mm:ss
	return preg_match('/^[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $value);
	case 'year':
	return preg_match('/^[0-9]{4}$/', $value);
	case 'month':
	return preg_match('/^[0-9]{2}$/', $value) && $value > 0 && $value < 13;
	case 'day':
	return preg_match('/^[0-9]{2}$/', $value) && $value > 0 && $value < 32;
	case 'hour':
	return preg_match('/^[0-9]{2}$/', $value) && $value < 24;
	case 'minute':
	return preg_match('/^[0-9]{2}$/', $value) && $value < 60;
	case 'second':
	// According to RFC5260, seconds can be from 00 to 60
	return preg_match('/^[0-9]{2}$/', $value) && $value < 61;
	case 'weekday':
	return preg_match('/^[0-9]$/', $value) && $value < 7;
	case 'zone':
	return preg_match('/^[+-][0-9]{4}$/', $value);
	}
	}

	/**
	* Converts mailbox name from/to UTF7-IMAP from/to internal Sieve encoding
	* with delimiter replacement.
	*
	* @param string $mailbox Mailbox name
	* @param string $mode Conversion direction ('in'\|'out')
	*
	* @return string Mailbox name
	*/
	protected function mod_mailbox($mailbox, $mode = 'out')
	{
	$delimiter = $_SESSION['imap_delimiter'];
	$replace_delimiter = $this->rc->config->get('managesieve_replace_delimiter');
	$mbox_encoding = $this->rc->config->get('managesieve_mbox_encoding', 'UTF7-IMAP');

	if ($mode == 'out') {
	$mailbox = rcube_charset::convert($mailbox, $mbox_encoding, 'UTF7-IMAP');
	if ($replace_delimiter && $replace_delimiter != $delimiter)
	$mailbox = str_replace($replace_delimiter, $delimiter, $mailbox);
	}
	else {
	$mailbox = rcube_charset::convert($mailbox, 'UTF7-IMAP', $mbox_encoding);
	if ($replace_delimiter && $replace_delimiter != $delimiter)
	$mailbox = str_replace($delimiter, $replace_delimiter, $mailbox);
	}

	return $mailbox;
	}

	/**
	* List sieve scripts
	*
	* @return array Scripts list
	*/
	public function list_scripts()
	{
	if ($this->list !== null) {
	return $this->list;
	}

	$this->list = $this->sieve->get_scripts();

	// Handle active script(s) and list of scripts according to Kolab's KEP:14
	if ($this->rc->config->get('managesieve_kolab_master')) {
	// Skip protected names
	foreach ((array)$this->list as $idx => $name) {
	$_name = strtoupper($name);
	if ($_name == 'MASTER')
	$master_script = $name;
	else if ($_name == 'MANAGEMENT')
	$management_script = $name;
	else if($_name == 'USER')
	$user_script = $name;
	else
	continue;

	unset($this->list[$idx]);
	}

	// get active script(s), read USER script
	if ($user_script) {
	$extension = $this->rc->config->get('managesieve_filename_extension', '.sieve');
	$filename_regex = '/'.preg_quote($extension, '/').'$/';
	$_SESSION['managesieve_user_script'] = $user_script;

	$this->sieve->load($user_script);

	foreach ($this->sieve->script->as_array() as $rules) {
	foreach ($rules['actions'] as $action) {
	if ($action['type'] == 'include' && empty($action['global'])) {
	$name = preg_replace($filename_regex, '', $action['target']);
	// make sure the script exist
	if (in_array($name, $this->list)) {
	$this->active[] = $name;
	}
	}
	}
	}
	}
	// create USER script if it doesn't exist
	else {
	$content = "# USER Management Script\n"
	."#\n"
	."# This script includes the various active sieve scripts\n"
	."# it is AUTOMATICALLY GENERATED. DO NOT EDIT MANUALLY!\n"
	."#\n"
	."# For more information, see http://wiki.kolab.org/KEP:14#USER\n"
	."#\n";
	if ($this->sieve->save_script('USER', $content)) {
	$_SESSION['managesieve_user_script'] = 'USER';
	if (empty($this->master_file))
	$this->sieve->activate('USER');
	}
	}
	}
	else if (!empty($this->list)) {
	// Get active script name
	if ($active = $this->sieve->get_active()) {
	$this->active = array($active);
	}

	// Hide scripts from config
	$exceptions = $this->rc->config->get('managesieve_filename_exceptions');
	if (!empty($exceptions)) {
	$this->list = array_diff($this->list, (array)$exceptions);
	}
	}

	// reindex
	if (!empty($this->list)) {
	$this->list = array_values($this->list);
	}

	return $this->list;
	}

	/**
	* Removes sieve script
	*
	* @param string $name Script name
	*
	* @return bool True on success, False on failure
	*/
	public function remove_script($name)
	{
	$result = $this->sieve->remove($name);

	// Kolab's KEP:14
	if ($result && $this->rc->config->get('managesieve_kolab_master')) {
	$this->deactivate_script($name);
	}

	return $result;
	}

	/**
	* Activates sieve script
	*
	* @param string $name Script name
	*
	* @return bool True on success, False on failure
	*/
	public function activate_script($name)
	{
	// Kolab's KEP:14
	if ($this->rc->config->get('managesieve_kolab_master')) {
	$extension = $this->rc->config->get('managesieve_filename_extension', '.sieve');
	$user_script = $_SESSION['managesieve_user_script'];

	// if the script is not active...
	if ($user_script && array_search($name, $this->active) === false) {
	// ...rewrite USER file adding appropriate include command
	if ($this->sieve->load($user_script)) {
	$script = $this->sieve->script->as_array();
	$list = array();
	$regexp = '/' . preg_quote($extension, '/') . '$/';

	// Create new include entry
	$rule = array(
	'actions' => array(
	0 => array(
	'target' => $name.$extension,
	'type' => 'include',
	'personal' => true,
	)));

	// get all active scripts for sorting
	foreach ($script as $rid => $rules) {
	foreach ($rules['actions'] as $action) {
	if ($action['type'] == 'include' && empty($action['global'])) {
	$target = $extension ? preg_replace($regexp, '', $action['target']) : $action['target'];
	$list[] = $target;
	}
	}
	}
	$list[] = $name;

	// Sort and find current script position
	asort($list, SORT_LOCALE_STRING);
	$list = array_values($list);
	$index = array_search($name, $list);

	// add rule at the end of the script
	if ($index === false \|\| $index == count($list)-1) {
	$this->sieve->script->add_rule($rule);
	}
	// add rule at index position
	else {
	$script2 = array();
	foreach ($script as $rid => $rules) {
	if ($rid == $index) {
	$script2[] = $rule;
	}
	$script2[] = $rules;
	}
	$this->sieve->script->content = $script2;
	}

	$result = $this->sieve->save();
	if ($result) {
	$this->active[] = $name;
	}
	}
	}
	}
	else {
	$result = $this->sieve->activate($name);
	if ($result)
	$this->active = array($name);
	}

	return $result;
	}

	/**
	* Deactivates sieve script
	*
	* @param string $name Script name
	*
	* @return bool True on success, False on failure
	*/
	public function deactivate_script($name)
	{
	// Kolab's KEP:14
	if ($this->rc->config->get('managesieve_kolab_master')) {
	$extension = $this->rc->config->get('managesieve_filename_extension', '.sieve');
	$user_script = $_SESSION['managesieve_user_script'];

	// if the script is active...
	if ($user_script && ($key = array_search($name, $this->active)) !== false) {
	// ...rewrite USER file removing appropriate include command
	if ($this->sieve->load($user_script)) {
	$script = $this->sieve->script->as_array();
	$name = $name.$extension;

	foreach ($script as $rid => $rules) {
	foreach ($rules['actions'] as $action) {
	if ($action['type'] == 'include' && empty($action['global'])
	&& $action['target'] == $name
	) {
	break 2;
	}
	}
	}

	// Entry found
	if ($rid < count($script)) {
	$this->sieve->script->delete_rule($rid);
	$result = $this->sieve->save();
	if ($result) {
	unset($this->active[$key]);
	}
	}
	}
	}
	}
	else {
	$result = $this->sieve->deactivate();
	if ($result)
	$this->active = array();
	}

	return $result;
	}

	/**
	* Saves current script (adding some variables)
	*/
	public function save_script($name = null)
	{
	// Kolab's KEP:14
	if ($this->rc->config->get('managesieve_kolab_master')) {
	$this->sieve->script->set_var('EDITOR', self::PROGNAME);
	$this->sieve->script->set_var('EDITOR_VERSION', self::VERSION);
	}

	return $this->sieve->save($name);
	}

	/**
	* Returns list of rules from the current script
	*
	* @return array List of rules
	*/
	public function list_rules()
	{
	$result = array();
	$i = 1;

	foreach ($this->script as $idx => $filter) {
	if (empty($filter['actions'])) {
	continue;
	}
	$fname = $filter['name'] ?: "#$i";
	$result[] = array(
	'id' => $idx,
	'name' => $fname,
	'class' => $filter['disabled'] ? 'disabled' : '',
	);
	$i++;
	}

	return $result;
	}

	/**
	* Initializes internal script data
	*/
	protected function init_script()
	{
	if (!$this->sieve->script) {
	return;
	}

	$this->script = $this->sieve->script->as_array();

	$headers = array();
	$exceptions = array('date', 'currentdate', 'size', 'body');

	// find common headers used in script, will be added to the list
	// of available (predefined) headers (#1489271)
	foreach ($this->script as $rule) {
	foreach ((array) $rule['tests'] as $test) {
	if ($test['test'] == 'header') {
	foreach ((array) $test['arg1'] as $header) {
	$lc_header = strtolower($header);

	// skip special names to not confuse UI
	if (in_array($lc_header, $exceptions)) {
	continue;
	}

	if (!isset($this->headers[$lc_header]) && !isset($headers[$lc_header])) {
	$headers[$lc_header] = $header;
	}
	}
	}
	}
	}

	ksort($headers);

	$this->headers += $headers;
	}

	/**
	* Get all e-mail addresses of the user
	*/
	protected function user_emails()
	{
	$addresses = $this->rc->user->list_emails();

	foreach ($addresses as $idx => $email) {
	$addresses[$idx] = $email['email'];
	}

	$addresses = array_unique($addresses);
	sort($addresses);

	return $addresses;
	}
	}
	diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
	index b6a121b7b..66d687e2e 100644
	--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
	+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
	@@ -1,1311 +1,1317 @@
	<?php

	/**
	* Class for operations on Sieve scripts
	*
	* Copyright (C) 2008-2011, The Roundcube Dev Team
	* Copyright (C) 2011, Kolab Systems AG
	*
	* This program is free software: you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation, either version 3 of the License, or
	* (at your option) any later version.
	*
	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.
	*
	* You should have received a copy of the GNU General Public License
	* along with this program. If not, see http://www.gnu.org/licenses/.
	*/

	class rcube_sieve_script
	{
	public $content = array(); // script rules array

	private $vars = array(); // "global" variables
	private $prefix = ''; // script header (comments)
	private $supported = array( // supported Sieve extensions:
	'body', // RFC5173
	'copy', // RFC3894
	'date', // RFC5260
	'duplicate', // RFC7352
	'enotify', // RFC5435
	'envelope', // RFC5228
	'ereject', // RFC5429
	'fileinto', // RFC5228
	'imapflags', // draft-melnikov-sieve-imapflags-06
	'imap4flags', // RFC5232
	'include', // RFC6609
	'index', // RFC5260
	'notify', // RFC5435
	'regex', // draft-ietf-sieve-regex-01
	'reject', // RFC5429
	'relational', // RFC3431
	'subaddress', // RFC5233
	'vacation', // RFC5230
	'vacation-seconds', // RFC6131
	'variables', // RFC5229
	// @TODO: spamtest+virustest, mailbox
	);

	/**
	* Object constructor
	*
	* @param string Script's text content
	* @param array List of capabilities supported by server
	*/
	public function __construct($script, $capabilities=array())
	{
	$capabilities = array_map('strtolower', (array) $capabilities);

	// disable features by server capabilities
	if (!empty($capabilities)) {
	foreach ($this->supported as $idx => $ext) {
	if (!in_array($ext, $capabilities)) {
	unset($this->supported[$idx]);
	}
	}
	}

	// Parse text content of the script
	$this->_parse_text($script);
	}

	/**
	* Adds rule to the script (at the end)
	*
	* @param string Rule name
	* @param array Rule content (as array)
	*
	* @return int The index of the new rule
	*/
	public function add_rule($content)
	{
	// TODO: check this->supported
	array_push($this->content, $content);
	return sizeof($this->content)-1;
	}

	public function delete_rule($index)
	{
	if(isset($this->content[$index])) {
	unset($this->content[$index]);
	return true;
	}
	return false;
	}

	public function size()
	{
	return sizeof($this->content);
	}

	public function update_rule($index, $content)
	{
	// TODO: check this->supported
	if ($this->content[$index]) {
	$this->content[$index] = $content;
	return $index;
	}
	return false;
	}

	/**
	* Sets "global" variable
	*
	* @param string $name Variable name
	* @param string $value Variable value
	* @param array $mods Variable modifiers
	*/
	public function set_var($name, $value, $mods = array())
	{
	// Check if variable exists
	for ($i=0, $len=count($this->vars); $i<$len; $i++) {
	if ($this->vars[$i]['name'] == $name) {
	break;
	}
	}

	$var = array_merge($mods, array('name' => $name, 'value' => $value));
	$this->vars[$i] = $var;
	}

	/**
	* Unsets "global" variable
	*
	* @param string $name Variable name
	*/
	public function unset_var($name)
	{
	// Check if variable exists
	foreach ($this->vars as $idx => $var) {
	if ($var['name'] == $name) {
	unset($this->vars[$idx]);
	break;
	}
	}
	}

	/**
	* Gets the value of "global" variable
	*
	* @param string $name Variable name
	*
	* @return string Variable value
	*/
	public function get_var($name)
	{
	// Check if variable exists
	for ($i=0, $len=count($this->vars); $i<$len; $i++) {
	if ($this->vars[$i]['name'] == $name) {
	return $this->vars[$i]['name'];
	}
	}
	}

	/**
	* Sets script header content
	*
	* @param string $text Header content
	*/
	public function set_prefix($text)
	{
	$this->prefix = $text;
	}

	/**
	* Returns script as text
	*/
	public function as_text()
	{
	$output = '';
	$exts = array();
	$idx = 0;

	if (!empty($this->vars)) {
	if (in_array('variables', (array)$this->supported)) {
	$has_vars = true;
	array_push($exts, 'variables');
	}
	foreach ($this->vars as $var) {
	if (empty($has_vars)) {
	// 'variables' extension not supported, put vars in comments
	$output .= sprintf("# %s %s\n", $var['name'], $var['value']);
	}
	else {
	$output .= 'set ';
	foreach (array_diff(array_keys($var), array('name', 'value')) as $opt) {
	$output .= ":$opt ";
	}
	$output .= self::escape_string($var['name']) . ' ' . self::escape_string($var['value']) . ";\n";
	}
	}
	}

	$imapflags = in_array('imap4flags', $this->supported) ? 'imap4flags' : 'imapflags';
	$notify = in_array('enotify', $this->supported) ? 'enotify' : 'notify';

	// rules
	foreach ($this->content as $rule) {
	$script = '';
	$tests = array();
	$i = 0;

	// header
	if (!empty($rule['name']) && strlen($rule['name'])) {
	$script .= '# rule:[' . $rule['name'] . "]\n";
	}

	// constraints expressions
	if (!empty($rule['tests'])) {
	foreach ($rule['tests'] as $test) {
	$tests[$i] = '';
	switch ($test['test']) {
	case 'size':
	$tests[$i] .= ($test['not'] ? 'not ' : '');
	$tests[$i] .= 'size :' . ($test['type']=='under' ? 'under ' : 'over ') . $test['arg'];
	break;

	case 'true':
	$tests[$i] .= ($test['not'] ? 'false' : 'true');
	break;

	case 'exists':
	$tests[$i] .= ($test['not'] ? 'not ' : '');
	$tests[$i] .= 'exists ' . self::escape_string($test['arg']);
	break;

	case 'header':
	+ case 'string':
	+ if ($test['test'] == 'string') {
	+ array_push($exts, 'variables');
	+ }
	+
	$tests[$i] .= ($test['not'] ? 'not ' : '');
	- $tests[$i] .= 'header';
	+ $tests[$i] .= $test['test'];

	$this->add_index($test, $tests[$i], $exts);
	$this->add_operator($test, $tests[$i], $exts);

	$tests[$i] .= ' ' . self::escape_string($test['arg1']);
	$tests[$i] .= ' ' . self::escape_string($test['arg2']);
	break;

	case 'address':
	case 'envelope':
	if ($test['test'] == 'envelope') {
	array_push($exts, 'envelope');
	}

	$tests[$i] .= ($test['not'] ? 'not ' : '');
	$tests[$i] .= $test['test'];

	if ($test['test'] != 'envelope') {
	$this->add_index($test, $tests[$i], $exts);
	}

	// :all address-part is optional, skip it
	if (!empty($test['part']) && $test['part'] != 'all') {
	$tests[$i] .= ' :' . $test['part'];
	if ($test['part'] == 'user' \|\| $test['part'] == 'detail') {
	array_push($exts, 'subaddress');
	}
	}

	$this->add_operator($test, $tests[$i], $exts);

	$tests[$i] .= ' ' . self::escape_string($test['arg1']);
	$tests[$i] .= ' ' . self::escape_string($test['arg2']);
	break;

	case 'body':
	array_push($exts, 'body');

	$tests[$i] .= ($test['not'] ? 'not ' : '') . 'body';

	if (!empty($test['part'])) {
	$tests[$i] .= ' :' . $test['part'];

	if (!empty($test['content']) && $test['part'] == 'content') {
	$tests[$i] .= ' ' . self::escape_string($test['content']);
	}
	}

	$this->add_operator($test, $tests[$i], $exts);

	$tests[$i] .= ' ' . self::escape_string($test['arg']);
	break;

	case 'date':
	case 'currentdate':
	array_push($exts, 'date');

	$tests[$i] .= ($test['not'] ? 'not ' : '') . $test['test'];

	$this->add_index($test, $tests[$i], $exts);

	if (!empty($test['originalzone']) && $test['test'] == 'date') {
	$tests[$i] .= ' :originalzone';
	}
	else if (!empty($test['zone'])) {
	$tests[$i] .= ' :zone ' . self::escape_string($test['zone']);
	}

	$this->add_operator($test, $tests[$i], $exts);

	if ($test['test'] == 'date') {
	$tests[$i] .= ' ' . self::escape_string($test['header']);
	}

	$tests[$i] .= ' ' . self::escape_string($test['part']);
	$tests[$i] .= ' ' . self::escape_string($test['arg']);

	break;

	case 'duplicate':
	array_push($exts, 'duplicate');

	$tests[$i] .= ($test['not'] ? 'not ' : '') . $test['test'];

	$tokens = array('handle', 'uniqueid', 'header');
	foreach ($tokens as $token)
	if ($test[$token] !== null && $test[$token] !== '') {
	$tests[$i] .= " :$token " . self::escape_string($test[$token]);
	}

	if (!empty($test['seconds'])) {
	$tests[$i] .= ' :seconds ' . intval($test['seconds']);
	}

	if (!empty($test['last'])) {
	$tests[$i] .= ' :last';
	}

	break;
	}

	$i++;
	}
	}

	// disabled rule: if false #....
	if (!empty($tests)) {
	$script .= 'if ' . ($rule['disabled'] ? 'false # ' : '');

	if (count($tests) > 1) {
	$tests_str = implode(', ', $tests);
	}
	else {
	$tests_str = $tests[0];
	}

	if ($rule['join'] \|\| count($tests) > 1) {
	$script .= sprintf('%s (%s)', $rule['join'] ? 'allof' : 'anyof', $tests_str);
	}
	else {
	$script .= $tests_str;
	}
	$script .= "\n{\n";
	}

	// action(s)
	if (!empty($rule['actions'])) {
	foreach ($rule['actions'] as $action) {
	$action_script = '';

	switch ($action['type']) {

	case 'fileinto':
	array_push($exts, 'fileinto');
	$action_script .= 'fileinto ';
	if ($action['copy']) {
	$action_script .= ':copy ';
	array_push($exts, 'copy');
	}
	$action_script .= self::escape_string($action['target']);
	break;

	case 'redirect':
	$action_script .= 'redirect ';
	if ($action['copy']) {
	$action_script .= ':copy ';
	array_push($exts, 'copy');
	}
	$action_script .= self::escape_string($action['target']);
	break;

	case 'reject':
	case 'ereject':
	array_push($exts, $action['type']);
	$action_script .= $action['type'].' '
	. self::escape_string($action['target']);
	break;

	case 'addflag':
	case 'setflag':
	case 'removeflag':
	array_push($exts, $imapflags);
	$action_script .= $action['type'].' '
	. self::escape_string($action['target']);
	break;

	case 'keep':
	case 'discard':
	case 'stop':
	$action_script .= $action['type'];
	break;

	case 'include':
	array_push($exts, 'include');
	$action_script .= 'include ';
	foreach (array_diff(array_keys($action), array('target', 'type')) as $opt) {
	$action_script .= ":$opt ";
	}
	$action_script .= self::escape_string($action['target']);
	break;

	case 'set':
	array_push($exts, 'variables');
	$action_script .= 'set ';
	foreach (array_diff(array_keys($action), array('name', 'value', 'type')) as $opt) {
	$action_script .= ":$opt ";
	}
	$action_script .= self::escape_string($action['name']) . ' ' . self::escape_string($action['value']);
	break;

	case 'notify':
	array_push($exts, $notify);
	$action_script .= 'notify';

	$method = $action['method'];
	unset($action['method']);
	$action['options'] = (array) $action['options'];

	// Here we support draft-martin-sieve-notify-01 used by Cyrus
	if ($notify == 'notify') {
	switch ($action['importance']) {
	case 1: $action_script .= " :high"; break;
	//case 2: $action_script .= " :normal"; break;
	case 3: $action_script .= " :low"; break;
	}

	// Old-draft way: :method "mailto" :options "email@address"
	if (!empty($method)) {
	$parts = explode(':', $method, 2);
	$action['method'] = $parts[0];
	array_unshift($action['options'], $parts[1]);
	}

	unset($action['importance']);
	unset($action['from']);
	unset($method);
	}

	foreach (array('id', 'importance', 'method', 'options', 'from', 'message') as $n_tag) {
	if (!empty($action[$n_tag])) {
	$action_script .= " :$n_tag " . self::escape_string($action[$n_tag]);
	}
	}

	if (!empty($method)) {
	$action_script .= ' ' . self::escape_string($method);
	}

	break;

	case 'vacation':
	array_push($exts, 'vacation');
	$action_script .= 'vacation';
	if (isset($action['seconds'])) {
	array_push($exts, 'vacation-seconds');
	$action_script .= " :seconds " . intval($action['seconds']);
	}
	else if (!empty($action['days'])) {
	$action_script .= " :days " . intval($action['days']);
	}
	if (!empty($action['addresses']))
	$action_script .= " :addresses " . self::escape_string($action['addresses']);
	if (!empty($action['subject']))
	$action_script .= " :subject " . self::escape_string($action['subject']);
	if (!empty($action['handle']))
	$action_script .= " :handle " . self::escape_string($action['handle']);
	if (!empty($action['from']))
	$action_script .= " :from " . self::escape_string($action['from']);
	if (!empty($action['mime']))
	$action_script .= " :mime";
	$action_script .= " " . self::escape_string($action['reason']);
	break;
	}

	if ($action_script) {
	$script .= !empty($tests) ? "\t" : '';
	$script .= $action_script . ";\n";
	}
	}
	}

	if ($script) {
	$output .= $script . (!empty($tests) ? "}\n" : '');
	$idx++;
	}
	}

	// requires
	if (!empty($exts)) {
	$exts = array_unique($exts);

	if (in_array('vacation-seconds', $exts) && ($key = array_search('vacation', $exts)) !== false) {
	unset($exts[$key]);
	}

	sort($exts); // for convenience use always the same order

	$output = 'require ["' . implode('","', $exts) . "\"];\n" . $output;
	}

	if (!empty($this->prefix)) {
	$output = $this->prefix . "\n\n" . $output;
	}

	return $output;
	}

	/**
	* Returns script object
	*
	*/
	public function as_array()
	{
	return $this->content;
	}

	/**
	* Returns array of supported extensions
	*
	*/
	public function get_extensions()
	{
	return array_values($this->supported);
	}

	/**
	* Converts text script to rules array
	*
	* @param string Text script
	*/
	private function _parse_text($script)
	{
	$prefix = '';
	$options = array();
	$position = 0;
	$length = strlen($script);

	while ($position < $length) {
	// skip whitespace chars
	$position = self::ltrim_position($script, $position);
	$rulename = '';

	// Comments
	while ($script[$position] === '#') {
	$endl = strpos($script, "\n", $position) ?: $length;
	$line = substr($script, $position, $endl - $position);

	// Roundcube format
	if (preg_match('/^# rule:\[(.*)\]/', $line, $matches)) {
	$rulename = $matches[1];
	}
	// KEP:14 variables
	else if (preg_match('/^# (EDITOR\|EDITOR_VERSION) (.+)$/', $line, $matches)) {
	$this->set_var($matches[1], $matches[2]);
	}
	// Horde-Ingo format
	else if (!empty($options['format']) && $options['format'] == 'INGO'
	&& preg_match('/^# (.*)/', $line, $matches)
	) {
	$rulename = $matches[1];
	}
	else if (empty($options['prefix'])) {
	$prefix .= $line . "\n";
	}

	$position = $endl + 1;
	}

	// handle script header
	if (empty($options['prefix'])) {
	$options['prefix'] = true;
	if ($prefix && strpos($prefix, 'horde.org/ingo')) {
	$options['format'] = 'INGO';
	}
	}

	// Control structures/blocks
	if (preg_match('/^(if\|else\|elsif)/i', substr($script, $position, 5))) {
	$rule = $this->_tokenize_rule($script, $position);
	if (strlen($rulename) && !empty($rule)) {
	$rule['name'] = $rulename;
	}
	}
	// Simple commands
	else {
	$rule = $this->_parse_actions($script, $position, ';');
	if (!empty($rule[0]) && is_array($rule)) {
	// set "global" variables
	if ($rule[0]['type'] == 'set') {
	unset($rule[0]['type']);
	$this->vars[] = $rule[0];
	unset($rule);
	}
	else {
	$rule = array('actions' => $rule);
	}
	}
	}

	if (!empty($rule)) {
	$this->content[] = $rule;
	}
	}

	if (!empty($prefix)) {
	$this->prefix = trim($prefix);
	}
	}

	/**
	* Convert text script fragment to rule object
	*
	* @param string $content The whole script content
	* @param int &$position Start position in the script
	*
	* @return array Rule data
	*/
	private function _tokenize_rule($content, &$position)
	{
	$cond = strtolower(self::tokenize($content, 1, $position));
	if ($cond != 'if' && $cond != 'elsif' && $cond != 'else') {
	return null;
	}

	$disabled = false;
	$join = false;
	$join_not = false;
	$length = strlen($content);

	// disabled rule (false + comment): if false # .....
	if (preg_match('/^\sfalse\s+#\s/i', substr($content, $position, 20), $m)) {
	$position += strlen($m[0]);
	$disabled = true;
	}

	while ($position < $length) {
	$tokens = self::tokenize($content, true, $position);
	$separator = array_pop($tokens);

	if (!empty($tokens)) {
	$token = array_shift($tokens);
	}
	else {
	$token = $separator;
	}

	$token = strtolower($token);

	if ($token == 'not') {
	$not = true;
	$token = strtolower(array_shift($tokens));
	}
	else {
	$not = false;
	}

	// we support "not allof" as a negation of allof sub-tests
	if ($join_not) {
	$not = !$not;
	}

	switch ($token) {
	case 'allof':
	$join = true;
	$join_not = $not;
	break;

	case 'anyof':
	break;

	case 'size':
	$test = array('test' => 'size', 'not' => $not);

	$test['arg'] = array_pop($tokens);

	for ($i=0, $len=count($tokens); $i<$len; $i++) {
	if (!is_array($tokens[$i])
	&& preg_match('/^:(under\|over)$/i', $tokens[$i])
	) {
	$test['type'] = strtolower(substr($tokens[$i], 1));
	}
	}

	$tests[] = $test;
	break;

	case 'header':
	+ case 'string':
	case 'address':
	case 'envelope':
	$test = array('test' => $token, 'not' => $not);

	$test['arg2'] = array_pop($tokens);
	$test['arg1'] = array_pop($tokens);

	$test += $this->test_tokens($tokens);

	- if ($token != 'header' && !empty($tokens)) {
	+ if ($token != 'header' && $token != 'string' && !empty($tokens)) {
	for ($i=0, $len=count($tokens); $i<$len; $i++) {
	if (!is_array($tokens[$i]) && preg_match('/^:(localpart\|domain\|all\|user\|detail)$/i', $tokens[$i])) {
	$test['part'] = strtolower(substr($tokens[$i], 1));
	}
	}
	}

	$tests[] = $test;
	break;

	case 'body':
	$test = array('test' => 'body', 'not' => $not);

	$test['arg'] = array_pop($tokens);

	$test += $this->test_tokens($tokens);

	for ($i=0, $len=count($tokens); $i<$len; $i++) {
	if (!is_array($tokens[$i]) && preg_match('/^:(raw\|content\|text)$/i', $tokens[$i])) {
	$test['part'] = strtolower(substr($tokens[$i], 1));

	if ($test['part'] == 'content') {
	$test['content'] = $tokens[++$i];
	}
	}
	}

	$tests[] = $test;
	break;

	case 'date':
	case 'currentdate':
	$test = array('test' => $token, 'not' => $not);

	$test['arg'] = array_pop($tokens);
	$test['part'] = array_pop($tokens);

	if ($token == 'date') {
	$test['header'] = array_pop($tokens);
	}

	$test += $this->test_tokens($tokens);

	for ($i=0, $len=count($tokens); $i<$len; $i++) {
	if (!is_array($tokens[$i]) && preg_match('/^:zone$/i', $tokens[$i])) {
	$test['zone'] = $tokens[++$i];
	}
	else if (!is_array($tokens[$i]) && preg_match('/^:originalzone$/i', $tokens[$i])) {
	$test['originalzone'] = true;
	}
	}

	$tests[] = $test;
	break;

	case 'duplicate':
	$test = array('test' => $token, 'not' => $not);

	for ($i=0, $len=count($tokens); $i<$len; $i++) {
	if (!is_array($tokens[$i])) {
	if (preg_match('/^:(handle\|header\|uniqueid\|seconds)$/i', $tokens[$i], $m)) {
	$test[strtolower($m[1])] = $tokens[++$i];
	}
	else if (preg_match('/^:last$/i', $tokens[$i])) {
	$test['last'] = true;
	}
	}
	}

	$tests[] = $test;
	break;

	case 'exists':
	$tests[] = array('test' => 'exists', 'not' => $not,
	'arg' => array_pop($tokens));
	break;

	case 'true':
	$tests[] = array('test' => 'true', 'not' => $not);
	break;

	case 'false':
	$tests[] = array('test' => 'true', 'not' => !$not);
	break;
	}

	// goto actions...
	if ($separator == '{') {
	break;
	}
	}

	// ...and actions block
	$actions = $this->_parse_actions($content, $position);

	if ($tests && $actions) {
	$result = array(
	'type' => $cond,
	'tests' => $tests,
	'actions' => $actions,
	'join' => $join,
	'disabled' => $disabled,
	);
	}

	return $result;
	}

	/**
	* Parse body of actions section
	*
	* @param string $content The whole script content
	* @param int &$position Start position in the script
	* @param string $end End of text separator
	*
	* @return array Array of parsed action type/target pairs
	*/
	private function _parse_actions($content, &$position, $end = '}')
	{
	$result = null;
	$length = strlen($content);

	while ($position < $length) {
	$tokens = self::tokenize($content, true, $position);
	$separator = array_pop($tokens);
	$token = !empty($tokens) ? array_shift($tokens) : $separator;

	switch ($token) {
	case 'discard':
	case 'keep':
	case 'stop':
	$result[] = array('type' => $token);
	break;

	case 'fileinto':
	case 'redirect':
	$action = array('type' => $token, 'target' => array_pop($tokens));
	$args = array('copy');
	$action += $this->action_arguments($tokens, $args);

	$result[] = $action;
	break;

	case 'vacation':
	$action = array('type' => 'vacation', 'reason' => array_pop($tokens));
	$args = array('mime');
	$vargs = array('seconds', 'days', 'addresses', 'subject', 'handle', 'from');
	$action += $this->action_arguments($tokens, $args, $vargs);

	$result[] = $action;
	break;

	case 'reject':
	case 'ereject':
	case 'setflag':
	case 'addflag':
	case 'removeflag':
	$result[] = array('type' => $token, 'target' => array_pop($tokens));
	break;

	case 'include':
	$action = array('type' => 'include', 'target' => array_pop($tokens));
	$args = array('once', 'optional', 'global', 'personal');
	$action += $this->action_arguments($tokens, $args);

	$result[] = $action;
	break;

	case 'set':
	$action = array('type' => 'set', 'value' => array_pop($tokens), 'name' => array_pop($tokens));
	$args = array('lower', 'upper', 'lowerfirst', 'upperfirst', 'quotewildcard', 'length');
	$action += $this->action_arguments($tokens, $args);

	$result[] = $action;
	break;

	case 'require':
	// skip, will be build according to used commands
	// $result[] = array('type' => 'require', 'target' => array_pop($tokens));
	break;

	case 'notify':
	$action = array('type' => 'notify');
	$priorities = array('high' => 1, 'normal' => 2, 'low' => 3);
	$vargs = array('from', 'id', 'importance', 'options', 'message', 'method');
	$args = array_keys($priorities);
	$action += $this->action_arguments($tokens, $args, $vargs);

	// Here we'll convert draft-martin-sieve-notify-01 into RFC 5435
	if (!isset($action['importance'])) {
	foreach ($priorities as $key => $val) {
	if (isset($action[$key])) {
	$action['importance'] = $val;
	unset($action[$key]);
	}
	}
	}

	$action['options'] = (array) $action['options'];

	// Old-draft way: :method "mailto" :options "email@address"
	if (!empty($action['method']) && !empty($action['options'])) {
	$action['method'] .= ':' . array_shift($action['options']);
	}
	// unnamed parameter is a :method in enotify extension
	else if (!isset($action['method'])) {
	$action['method'] = array_pop($tokens);
	}

	$result[] = $action;
	break;
	}

	if ($separator == $end)
	break;
	}

	return $result;
	}

	/**
	* Add comparator to the test
	*/
	private function add_comparator($test, &$out, &$exts)
	{
	if (empty($test['comparator'])) {
	return;
	}

	if ($test['comparator'] == 'i;ascii-numeric') {
	array_push($exts, 'relational');
	array_push($exts, 'comparator-i;ascii-numeric');
	}
	else if (!in_array($test['comparator'], array('i;octet', 'i;ascii-casemap'))) {
	array_push($exts, 'comparator-' . $test['comparator']);
	}

	// skip default comparator
	if ($test['comparator'] != 'i;ascii-casemap') {
	$out .= ' :comparator ' . self::escape_string($test['comparator']);
	}
	}

	/**
	* Add index argument to the test
	*/
	private function add_index($test, &$out, &$exts)
	{
	if (!empty($test['index'])) {
	array_push($exts, 'index');
	$out .= ' :index ' . intval($test['index']) . ($test['last'] ? ' :last' : '');
	}
	}

	/**
	* Add operators to the test
	*/
	private function add_operator($test, &$out, &$exts)
	{
	if (empty($test['type'])) {
	return;
	}

	// relational operator
	if (preg_match('/^(value\|count)-([gteqnl]{2})/', $test['type'], $m)) {
	array_push($exts, 'relational');

	$out .= ' :' . $m[1] . ' "' . $m[2] . '"';
	}
	else {
	if ($test['type'] == 'regex') {
	array_push($exts, 'regex');
	}

	$out .= ' :' . $test['type'];
	}

	$this->add_comparator($test, $out, $exts);
	}

	/**
	* Extract test tokens
	*/
	private function test_tokens(&$tokens)
	{
	$test = array();
	$result = array();

	for ($i=0, $len=count($tokens); $i<$len; $i++) {
	if (!is_array($tokens[$i]) && preg_match('/^:comparator$/i', $tokens[$i])) {
	$test['comparator'] = $tokens[++$i];
	}
	else if (!is_array($tokens[$i]) && preg_match('/^:(count\|value)$/i', $tokens[$i])) {
	$test['type'] = strtolower(substr($tokens[$i], 1)) . '-' . $tokens[++$i];
	}
	else if (!is_array($tokens[$i]) && preg_match('/^:(is\|contains\|matches\|regex)$/i', $tokens[$i])) {
	$test['type'] = strtolower(substr($tokens[$i], 1));
	}
	else if (!is_array($tokens[$i]) && preg_match('/^:index$/i', $tokens[$i])) {
	$test['index'] = intval($tokens[++$i]);
	if ($tokens[$i+1] && preg_match('/^:last$/i', $tokens[$i+1])) {
	$test['last'] = true;
	$i++;
	}
	}
	else {
	$result[] = $tokens[$i];
	}
	}

	$tokens = $result;

	return $test;
	}

	/**
	* Extract action arguments
	*/
	private function action_arguments(&$tokens, $bool_args, $val_args = array())
	{
	$action = array();
	$result = array();

	for ($i=0, $len=count($tokens); $i<$len; $i++) {
	$tok = $tokens[$i];
	if (!is_array($tok) && $tok[0] == ':') {
	$tok = strtolower(substr($tok, 1));
	if (in_array($tok, $bool_args)) {
	$action[$tok] = true;
	}
	else if (in_array($tok, $val_args)) {
	$action[$tok] = $tokens[++$i];
	}
	else {
	$result[] = $tok;
	}
	}
	else {
	$result[] = $tok;
	}
	}

	$tokens = $result;

	return $action;
	}

	/**
	* Escape special chars into quoted string value or multi-line string
	* or list of strings
	*
	* @param string $str Text or array (list) of strings
	*
	* @return string Result text
	*/
	static function escape_string($str)
	{
	if (is_array($str) && count($str) > 1) {
	foreach($str as $idx => $val)
	$str[$idx] = self::escape_string($val);

	return '[' . implode(',', $str) . ']';
	}
	else if (is_array($str)) {
	$str = array_pop($str);
	}

	// multi-line string
	if (preg_match('/[\r\n\0]/', $str) \|\| strlen($str) > 1024) {
	return sprintf("text:\n%s\n.\n", self::escape_multiline_string($str));
	}
	// quoted-string
	else {
	return '"' . addcslashes($str, '\\"') . '"';
	}
	}

	/**
	* Escape special chars in multi-line string value
	*
	* @param string $str Text
	*
	* @return string Text
	*/
	static function escape_multiline_string($str)
	{
	$str = preg_split('/(\r?\n)/', $str, -1, PREG_SPLIT_DELIM_CAPTURE);

	foreach ($str as $idx => $line) {
	// dot-stuffing
	if (isset($line[0]) && $line[0] == '.') {
	$str[$idx] = '.' . $line;
	}
	}

	return implode($str);
	}

	/**
	* Splits script into string tokens
	*
	* @param string $str The script
	* @param mixed $num Number of tokens to return, 0 for all
	* or True for all tokens until separator is found.
	* Separator will be returned as last token.
	* @param int &$position Parsing start position
	*
	* @return mixed Tokens array or string if $num=1
	*/
	static function tokenize($str, $num = 0, &$position = 0)
	{
	$result = array();
	$length = strlen($str);

	// remove spaces from the beginning of the string
	while ($position < $length && (!$num \|\| $num === true \|\| count($result) < $num)) {
	// skip whitespace chars
	$position = self::ltrim_position($str, $position);

	switch ($str[$position]) {

	// Quoted string
	case '"':
	for ($pos = $position + 1; $pos < $length; $pos++) {
	if ($str[$pos] == '"') {
	break;
	}
	if ($str[$pos] == "\\") {
	if ($str[$pos + 1] == '"' \|\| $str[$pos + 1] == "\\") {
	$pos++;
	}
	}
	}
	if ($str[$pos] != '"') {
	// error
	}

	// we need to strip slashes for a quoted string
	$result[] = stripslashes(substr($str, $position + 1, $pos - $position - 1));
	$position = $pos + 1;
	break;

	// Parenthesized list
	case '[':
	$position++;
	$result[] = self::tokenize($str, 0, $position);
	break;
	case ']':
	$position++;
	return $result;
	break;

	// list/test separator
	case ',':
	// command separator
	case ';':
	// block/tests-list
	case '(':
	case ')':
	case '{':
	case '}':
	$sep = $str[$position];
	$position++;
	if ($num === true) {
	$result[] = $sep;
	break 2;
	}
	break;

	// bracket-comment
	case '/':
	if ($str[$position + 1] == '*') {
	if ($end_pos = strpos($str, '*/', $position + 2)) {
	$position = $end_pos + 2;
	}
	else {
	// error
	$position = $length;
	}
	}
	break;

	// hash-comment
	case '#':
	if ($lf_pos = strpos($str, "\n", $position)) {
	$position = $lf_pos + 1;
	break;
	}
	else {
	$position = $length;
	}

	// String atom
	default:
	// empty or one character
	if ($position == $length) {
	break 2;
	}
	if ($length - $position < 2) {
	$result[] = substr($str, $position);
	$position = $length;
	break;
	}

	// tag/identifier/number
	if (preg_match('/[a-zA-Z0-9:_]+/', $str, $m, PREG_OFFSET_CAPTURE, $position)
	&& $m[0][1] == $position
	) {
	$atom = $m[0][0];
	$position += strlen($atom);

	if ($atom != 'text:') {
	$result[] = $atom;
	}
	// multiline string
	else {
	// skip whitespace chars (except \r\n)
	$position = self::ltrim_position($str, $position, false);

	// possible hash-comment after "text:"
	if ($str[$position] === '#') {
	$endl = strpos($str, "\n", $position);
	$position = $endl ?: $length;
	}

	// skip \n or \r\n
	if ($str[$position] == "\n") {
	$position++;
	}
	else if ($str[$position] == "\r" && $str[$position] == "\n") {
	$position += 2;
	}

	$text = '';

	// get text until alone dot in a line
	while ($position < $length) {
	$pos = strpos($str, "\n.", $position);
	if ($pos === false) {
	break;
	}

	$text .= substr($str, $position, $pos - $position);
	$position = $pos + 2;

	if ($str[$pos] == "\n"
	\|\| ($str[$pos] == "\r" && $str[$pos + 1] == "\n")
	) {
	break;
	}
	}

	// remove dot-stuffing
	$text = str_replace("\n..", "\n.", $text);

	$result[] = $text;
	$position++;
	}
	}
	// fallback, skip one character as infinite loop prevention
	else {
	$position++;
	}

	break;
	}
	}

	return $num === 1 ? (isset($result[0]) ? $result[0] : null) : $result;
	}

	/**
	* Skip whitespace characters in a string from specified position.
	*/
	static function ltrim_position($content, $position, $br = true)
	{
	$blanks = array("\t", "\0", "\x0B", " ");

	if ($br) {
	$blanks[] = "\r";
	$blanks[] = "\n";
	}

	while (isset($content[$position]) && isset($content[$position + 1])
	&& in_array($content[$position], $blanks, true)
	) {
	$position++;
	}

	return $position;
	}
	}
	diff --git a/plugins/managesieve/localization/en_CA.inc b/plugins/managesieve/localization/en_CA.inc
	index 1850bbb01..6b66d13a8 100644
	--- a/plugins/managesieve/localization/en_CA.inc
	+++ b/plugins/managesieve/localization/en_CA.inc
	@@ -1,207 +1,208 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| plugins/managesieve/localization/<lang>.inc \|
	\| \|
	\| Localization file of the Roundcube Webmail Managesieve plugin \|
	\| Copyright (C) 2012-2013, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	+-----------------------------------------------------------------------+

	For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
	*/
	$labels['filters'] = 'Filters';
	$labels['managefilters'] = 'Manage incoming mail filters';
	$labels['filtername'] = 'Filter name';
	$labels['newfilter'] = 'New filter';
	$labels['filteradd'] = 'Add filter';
	$labels['filterdel'] = 'Delete filter';
	$labels['moveup'] = 'Move up';
	$labels['movedown'] = 'Move down';
	$labels['filterallof'] = 'matching all of the following rules';
	$labels['filteranyof'] = 'matching any of the following rules';
	$labels['filterany'] = 'all messages';
	$labels['filtercontains'] = 'contains';
	$labels['filternotcontains'] = 'not contains';
	$labels['filteris'] = 'is equal to';
	$labels['filterisnot'] = 'is not equal to';
	$labels['filterexists'] = 'exists';
	$labels['filternotexists'] = 'not exists';
	$labels['filtermatches'] = 'matches expression';
	$labels['filternotmatches'] = 'not matches expression';
	$labels['filterregex'] = 'matches regular expression';
	$labels['filternotregex'] = 'not matches regular expression';
	$labels['filterunder'] = 'under';
	$labels['filterover'] = 'over';
	$labels['addrule'] = 'Add rule';
	$labels['delrule'] = 'Delete rule';
	$labels['messagemoveto'] = 'Move message to';
	$labels['messageredirect'] = 'Redirect message to';
	$labels['messagecopyto'] = 'Copy message to';
	$labels['messagesendcopy'] = 'Send message copy to';
	$labels['messagereply'] = 'Reply with message';
	$labels['messagedelete'] = 'Delete message';
	$labels['messagediscard'] = 'Discard with message';
	$labels['messagekeep'] = 'Keep message in Inbox';
	$labels['messagesrules'] = 'For incoming mail:';
	$labels['messagesactions'] = '...execute the following actions:';
	$labels['add'] = 'Add';
	$labels['del'] = 'Delete';
	$labels['sender'] = 'Sender';
	$labels['recipient'] = 'Recipient';
	$labels['vacationdays'] = 'How often send messages (in days):';
	$labels['vacationinterval'] = 'How often send messages:';
	$labels['vacationreason'] = 'Message body (vacation reason):';
	$labels['vacationsubject'] = 'Message subject:';
	$labels['days'] = 'days';
	$labels['seconds'] = 'seconds';
	$labels['rulestop'] = 'Stop evaluating rules';
	$labels['enable'] = 'Enable/Disable';
	$labels['filterset'] = 'Filters set';
	$labels['filtersets'] = 'Filter sets';
	$labels['filtersetadd'] = 'Add filters set';
	$labels['filtersetdel'] = 'Delete current filters set';
	$labels['filtersetact'] = 'Activate current filters set';
	$labels['filtersetdeact'] = 'Deactivate current filters set';
	$labels['filterdef'] = 'Filter definition';
	$labels['filtersetname'] = 'Filters set name';
	$labels['newfilterset'] = 'New filters set';
	$labels['active'] = 'active';
	$labels['none'] = 'none';
	$labels['fromset'] = 'from set';
	$labels['fromfile'] = 'from file';
	$labels['filterdisabled'] = 'Filter disabled';
	$labels['countisgreaterthan'] = 'count is greater than';
	$labels['countisgreaterthanequal'] = 'count is greater than or equal to';
	$labels['countislessthan'] = 'count is less than';
	$labels['countislessthanequal'] = 'count is less than or equal to';
	$labels['countequals'] = 'count is equal to';
	$labels['countnotequals'] = 'count is not equal to';
	$labels['valueisgreaterthan'] = 'value is greater than';
	$labels['valueisgreaterthanequal'] = 'value is greater than or equal to';
	$labels['valueislessthan'] = 'value is less than';
	$labels['valueislessthanequal'] = 'value is less than or equal to';
	$labels['valueequals'] = 'value is equal to';
	$labels['valuenotequals'] = 'value is not equal to';
	$labels['setflags'] = 'Set flags to the message';
	$labels['addflags'] = 'Add flags to the message';
	$labels['removeflags'] = 'Remove flags from the message';
	$labels['flagread'] = 'Read';
	$labels['flagdeleted'] = 'Deleted';
	$labels['flaganswered'] = 'Answered';
	$labels['flagflagged'] = 'Flagged';
	$labels['flagdraft'] = 'Draft';
	$labels['setvariable'] = 'Set variable';
	$labels['setvarname'] = 'Variable name:';
	$labels['setvarvalue'] = 'Variable value:';
	$labels['setvarmodifiers'] = 'Modifiers:';
	$labels['varlower'] = 'lower-case';
	$labels['varupper'] = 'upper-case';
	$labels['varlowerfirst'] = 'first character lower-case';
	$labels['varupperfirst'] = 'first character upper-case';
	$labels['varquotewildcard'] = 'quote special characters';
	$labels['varlength'] = 'length';
	$labels['notify'] = 'Send notification';
	$labels['notifytarget'] = 'Notification target:';
	$labels['notifymessage'] = 'Notification message (optional):';
	$labels['notifyoptions'] = 'Notification options (optional):';
	$labels['notifyfrom'] = 'Notification sender (optional):';
	$labels['notifyimportance'] = 'Importance:';
	$labels['notifyimportancelow'] = 'low';
	$labels['notifyimportancenormal'] = 'normal';
	$labels['notifyimportancehigh'] = 'high';
	$labels['notifymethodmailto'] = 'Email';
	$labels['notifymethodtel'] = 'Phone';
	$labels['notifymethodsms'] = 'SMS';
	$labels['filtercreate'] = 'Create filter';
	$labels['usedata'] = 'Use following data in the filter:';
	$labels['nextstep'] = 'Next Step';
	$labels['...'] = '...';
	+$labels['string'] = 'String';
	$labels['currdate'] = 'Current date';
	$labels['datetest'] = 'Date';
	$labels['dateheader'] = 'header:';
	$labels['year'] = 'year';
	$labels['month'] = 'month';
	$labels['day'] = 'day';
	$labels['date'] = 'date (yyyy-mm-dd)';
	$labels['julian'] = 'date (julian)';
	$labels['hour'] = 'hour';
	$labels['minute'] = 'minute';
	$labels['second'] = 'second';
	$labels['time'] = 'time (hh:mm:ss)';
	$labels['iso8601'] = 'date (ISO8601)';
	$labels['std11'] = 'date (RFC2822)';
	$labels['zone'] = 'time-zone';
	$labels['weekday'] = 'weekday (0-6)';
	$labels['advancedopts'] = 'Advanced options';
	$labels['body'] = 'Body';
	$labels['address'] = 'address';
	$labels['envelope'] = 'envelope';
	$labels['modifier'] = 'modifier:';
	$labels['text'] = 'text';
	$labels['undecoded'] = 'undecoded (raw)';
	$labels['contenttype'] = 'content type';
	$labels['modtype'] = 'type:';
	$labels['allparts'] = 'all';
	$labels['domain'] = 'domain';
	$labels['localpart'] = 'local part';
	$labels['user'] = 'user';
	$labels['detail'] = 'detail';
	$labels['comparator'] = 'comparator:';
	$labels['default'] = 'default';
	$labels['octet'] = 'strict (octet)';
	$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
	$labels['asciinumeric'] = 'numeric (ascii-numeric)';
	$labels['index'] = 'index:';
	$labels['indexlast'] = 'backwards';
	$labels['vacation'] = 'Vacation';
	$labels['vacation.reply'] = 'Reply message';
	$labels['vacation.advanced'] = 'Advanced settings';
	$labels['vacation.subject'] = 'Subject';
	$labels['vacation.body'] = 'Body';
	$labels['vacation.status'] = 'Status';
	$labels['vacation.on'] = 'On';
	$labels['vacation.off'] = 'Off';
	$labels['vacation.interval'] = 'Reply interval';
	$labels['vacation.after'] = 'Put vacation rule after';
	$labels['vacation.saving'] = 'Saving data...';
	$messages['filterunknownerror'] = 'Unknown server error.';
	$messages['filterconnerror'] = 'Unable to connect to server.';
	$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occurred.';
	$messages['filterdeleted'] = 'Filter deleted successfully.';
	$messages['filtersaved'] = 'Filter saved successfully.';
	$messages['filtersaveerror'] = 'Unable to save filter. Server error occurred.';
	$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
	$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
	$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
	$messages['forbiddenchars'] = 'Forbidden characters in field.';
	$messages['cannotbeempty'] = 'Field cannot be empty.';
	$messages['ruleexist'] = 'Filter with specified name already exists.';
	$messages['setactivateerror'] = 'Unable to activate selected filters set. Server error occurred.';
	$messages['setdeactivateerror'] = 'Unable to deactivate selected filters set. Server error occurred.';
	$messages['setdeleteerror'] = 'Unable to delete selected filters set. Server error occurred.';
	$messages['setactivated'] = 'Filters set activated successfully.';
	$messages['setdeactivated'] = 'Filters set deactivated successfully.';
	$messages['setdeleted'] = 'Filters set deleted successfully.';
	$messages['setdeleteconfirm'] = 'Are you sure, you want to delete selected filters set?';
	$messages['setcreateerror'] = 'Unable to create filters set. Server error occurred.';
	$messages['setcreated'] = 'Filters set created successfully.';
	$messages['activateerror'] = 'Unable to enable selected filter(s). Server error occurred.';
	$messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occurred.';
	$messages['deactivated'] = 'Filter(s) disabled successfully.';
	$messages['activated'] = 'Filter(s) enabled successfully.';
	$messages['moved'] = 'Filter moved successfully.';
	$messages['moveerror'] = 'Unable to move selected filter. Server error occurred.';
	$messages['nametoolong'] = 'Name too long.';
	$messages['namereserved'] = 'Reserved name.';
	$messages['setexist'] = 'Set already exists.';
	$messages['nodata'] = 'At least one position must be selected!';
	$messages['invaliddateformat'] = 'Invalid date or date part format';
	$messages['saveerror'] = 'Unable to save data. Server error occurred.';
	$messages['vacationsaved'] = 'Vacation data saved successfully.';
	?>
	diff --git a/plugins/managesieve/localization/en_GB.inc b/plugins/managesieve/localization/en_GB.inc
	index 0a0fbba57..33b93a3f8 100644
	--- a/plugins/managesieve/localization/en_GB.inc
	+++ b/plugins/managesieve/localization/en_GB.inc
	@@ -1,237 +1,238 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| plugins/managesieve/localization/<lang>.inc \|
	\| \|
	\| Localization file of the Roundcube Webmail Managesieve plugin \|
	\| Copyright (C) 2012-2013, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	+-----------------------------------------------------------------------+

	For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
	*/
	$labels['filters'] = 'Filters';
	$labels['managefilters'] = 'Manage incoming mail filters';
	$labels['filtername'] = 'Filter name';
	$labels['newfilter'] = 'New filter';
	$labels['filteradd'] = 'Add filter';
	$labels['filterdel'] = 'Delete filter';
	$labels['moveup'] = 'Move up';
	$labels['movedown'] = 'Move down';
	$labels['filterallof'] = 'matching all of the following rules';
	$labels['filteranyof'] = 'matching any of the following rules';
	$labels['filterany'] = 'all messages';
	$labels['filtercontains'] = 'contains';
	$labels['filternotcontains'] = 'not contains';
	$labels['filteris'] = 'is equal to';
	$labels['filterisnot'] = 'is not equal to';
	$labels['filterexists'] = 'exists';
	$labels['filternotexists'] = 'not exists';
	$labels['filtermatches'] = 'matches expression';
	$labels['filternotmatches'] = 'not matches expression';
	$labels['filterregex'] = 'matches regular expression';
	$labels['filternotregex'] = 'not matches regular expression';
	$labels['filterunder'] = 'under';
	$labels['filterover'] = 'over';
	$labels['addrule'] = 'Add rule';
	$labels['delrule'] = 'Delete rule';
	$labels['messagemoveto'] = 'Move message to';
	$labels['messageredirect'] = 'Redirect message to';
	$labels['messagecopyto'] = 'Copy message to';
	$labels['messagesendcopy'] = 'Send message copy to';
	$labels['messagereply'] = 'Reply with message';
	$labels['messagedelete'] = 'Delete message';
	$labels['messagediscard'] = 'Discard with message';
	$labels['messagekeep'] = 'Keep message in Inbox';
	$labels['messagesrules'] = 'For incoming mail:';
	$labels['messagesactions'] = '...execute the following actions:';
	$labels['add'] = 'Add';
	$labels['del'] = 'Delete';
	$labels['sender'] = 'Sender';
	$labels['recipient'] = 'Recipient';
	$labels['vacationaddr'] = 'My e-mail addresses:';
	$labels['vacationdays'] = 'How often send messages (in days):';
	$labels['vacationinterval'] = 'How often send messages:';
	$labels['vacationreason'] = 'Message body (vacation reason):';
	$labels['vacationfrom'] = 'Reply sender address:';
	$labels['vacationsubject'] = 'Message subject:';
	$labels['days'] = 'days';
	$labels['seconds'] = 'seconds';
	$labels['rulestop'] = 'Stop evaluating rules';
	$labels['enable'] = 'Enable/Disable';
	$labels['filterset'] = 'Filters set';
	$labels['filtersets'] = 'Filter sets';
	$labels['filtersetadd'] = 'Add filters set';
	$labels['filtersetdel'] = 'Delete current filters set';
	$labels['filtersetact'] = 'Activate current filters set';
	$labels['filtersetdeact'] = 'Deactivate current filters set';
	$labels['filterdef'] = 'Filter definition';
	$labels['filtersetname'] = 'Filters set name';
	$labels['newfilterset'] = 'New filters set';
	$labels['active'] = 'active';
	$labels['none'] = 'none';
	$labels['fromset'] = 'from set';
	$labels['fromfile'] = 'from file';
	$labels['filterdisabled'] = 'Filter disabled';
	$labels['countisgreaterthan'] = 'count is greater than';
	$labels['countisgreaterthanequal'] = 'count is greater than or equal to';
	$labels['countislessthan'] = 'count is less than';
	$labels['countislessthanequal'] = 'count is less than or equal to';
	$labels['countequals'] = 'count is equal to';
	$labels['countnotequals'] = 'count is not equal to';
	$labels['valueisgreaterthan'] = 'value is greater than';
	$labels['valueisgreaterthanequal'] = 'value is greater than or equal to';
	$labels['valueislessthan'] = 'value is less than';
	$labels['valueislessthanequal'] = 'value is less than or equal to';
	$labels['valueequals'] = 'value is equal to';
	$labels['valuenotequals'] = 'value is not equal to';
	$labels['setflags'] = 'Set flags to the message';
	$labels['addflags'] = 'Add flags to the message';
	$labels['removeflags'] = 'Remove flags from the message';
	$labels['flagread'] = 'Read';
	$labels['flagdeleted'] = 'Deleted';
	$labels['flaganswered'] = 'Answered';
	$labels['flagflagged'] = 'Flagged';
	$labels['flagdraft'] = 'Draft';
	$labels['setvariable'] = 'Set variable';
	$labels['setvarname'] = 'Variable name:';
	$labels['setvarvalue'] = 'Variable value:';
	$labels['setvarmodifiers'] = 'Modifiers:';
	$labels['varlower'] = 'lower-case';
	$labels['varupper'] = 'upper-case';
	$labels['varlowerfirst'] = 'first character lower-case';
	$labels['varupperfirst'] = 'first character upper-case';
	$labels['varquotewildcard'] = 'quote special characters';
	$labels['varlength'] = 'length';
	$labels['notify'] = 'Send notification';
	$labels['notifytarget'] = 'Notification target:';
	$labels['notifymessage'] = 'Notification message (optional):';
	$labels['notifyoptions'] = 'Notification options (optional):';
	$labels['notifyfrom'] = 'Notification sender (optional):';
	$labels['notifyimportance'] = 'Importance:';
	$labels['notifyimportancelow'] = 'low';
	$labels['notifyimportancenormal'] = 'normal';
	$labels['notifyimportancehigh'] = 'high';
	$labels['notifymethodmailto'] = 'Email';
	$labels['notifymethodtel'] = 'Phone';
	$labels['notifymethodsms'] = 'SMS';
	$labels['filtercreate'] = 'Create filter';
	$labels['usedata'] = 'Use following data in the filter:';
	$labels['nextstep'] = 'Next Step';
	$labels['...'] = '...';
	+$labels['string'] = 'String';
	$labels['currdate'] = 'Current date';
	$labels['datetest'] = 'Date';
	$labels['dateheader'] = 'header:';
	$labels['year'] = 'year';
	$labels['month'] = 'month';
	$labels['day'] = 'day';
	$labels['date'] = 'date (yyyy-mm-dd)';
	$labels['julian'] = 'date (julian)';
	$labels['hour'] = 'hour';
	$labels['minute'] = 'minute';
	$labels['second'] = 'second';
	$labels['time'] = 'time (hh:mm:ss)';
	$labels['iso8601'] = 'date (ISO8601)';
	$labels['std11'] = 'date (RFC2822)';
	$labels['zone'] = 'time-zone';
	$labels['weekday'] = 'weekday (0-6)';
	$labels['advancedopts'] = 'Advanced options';
	$labels['body'] = 'Body';
	$labels['address'] = 'address';
	$labels['envelope'] = 'envelope';
	$labels['modifier'] = 'modifier:';
	$labels['text'] = 'text';
	$labels['undecoded'] = 'undecoded (raw)';
	$labels['contenttype'] = 'content type';
	$labels['modtype'] = 'type:';
	$labels['allparts'] = 'all';
	$labels['domain'] = 'domain';
	$labels['localpart'] = 'local part';
	$labels['user'] = 'user';
	$labels['detail'] = 'detail';
	$labels['comparator'] = 'comparator:';
	$labels['default'] = 'default';
	$labels['octet'] = 'strict (octet)';
	$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
	$labels['asciinumeric'] = 'numeric (ascii-numeric)';
	$labels['index'] = 'index:';
	$labels['indexlast'] = 'backwards';
	$labels['vacation'] = 'Vacation';
	$labels['vacation.reply'] = 'Reply message';
	$labels['vacation.advanced'] = 'Advanced settings';
	$labels['vacation.from'] = 'Reply sender address';
	$labels['vacation.subject'] = 'Subject';
	$labels['vacation.body'] = 'Body';
	$labels['vacation.start'] = 'Vacation start';
	$labels['vacation.end'] = 'Vacation end';
	$labels['vacation.status'] = 'Status';
	$labels['vacation.on'] = 'On';
	$labels['vacation.off'] = 'Off';
	$labels['vacation.addresses'] = 'My e-mail addresses';
	$labels['vacation.interval'] = 'Reply interval';
	$labels['vacation.after'] = 'Put vacation rule after';
	$labels['vacation.saving'] = 'Saving data...';
	$labels['vacation.action'] = 'Incoming message action';
	$labels['vacation.keep'] = 'Keep';
	$labels['vacation.discard'] = 'Discard';
	$labels['vacation.redirect'] = 'Redirect to';
	$labels['vacation.copy'] = 'Send copy to';
	$labels['filladdresses'] = 'Fill with all my addresses';
	$labels['arialabelfiltersetactions'] = 'Filter set actions';
	$labels['arialabelfilteractions'] = 'Filter actions';
	$labels['arialabelfilterform'] = 'Filter properties';
	$labels['ariasummaryfilterslist'] = 'List of filters';
	$labels['ariasummaryfiltersetslist'] = 'List of filter sets';
	$labels['filterstitle'] = 'Edit incoming mail filters';
	$labels['vacationtitle'] = 'Edit out-of-office rule';
	$labels['message'] = 'Message';
	$labels['duplicate'] = 'is duplicate';
	$labels['notduplicate'] = 'is not duplicate';
	$labels['duplicate.handle'] = 'handle:';
	$labels['duplicate.header'] = 'header:';
	$labels['duplicate.uniqueid'] = 'identifier:';
	$labels['duplicate.seconds'] = 'timeout (seconds):';
	$labels['duplicate.last'] = 'relative to the last execution';
	$messages['filterunknownerror'] = 'Unknown server error';
	$messages['filterconnerror'] = 'Unable to connect to managesieve server';
	$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occurred.';
	$messages['filterdeleted'] = 'Filter deleted successfully';
	$messages['filtersaved'] = 'Filter saved successfully';
	$messages['filtersaveerror'] = 'Unable to save filter. Server error occurred.';
	$messages['filterformerror'] = 'Filter form contains errors.';
	$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
	$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
	$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
	$messages['forbiddenchars'] = 'Forbidden characters in field';
	$messages['cannotbeempty'] = 'Field cannot be empty';
	$messages['ruleexist'] = 'Filter with specified name already exists.';
	$messages['setactivateerror'] = 'Unable to activate selected filters set. Server error occurred.';
	$messages['setdeactivateerror'] = 'Unable to deactivate selected filters set. Server error occurred.';
	$messages['setdeleteerror'] = 'Unable to delete selected filters set. Server error occurred.';
	$messages['setactivated'] = 'Filters set activated successfully.';
	$messages['setdeactivated'] = 'Filters set deactivated successfully.';
	$messages['setdeleted'] = 'Filters set deleted successfully.';
	$messages['setdeleteconfirm'] = 'Are you sure, you want to delete selected filters set?';
	$messages['setcreateerror'] = 'Unable to create filters set. Server error occurred.';
	$messages['setcreated'] = 'Filters set created successfully.';
	$messages['activateerror'] = 'Unable to enable selected filter(s). Server error occurred.';
	$messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occurred.';
	$messages['deactivated'] = 'Filter(s) disabled successfully.';
	$messages['activated'] = 'Filter(s) enabled successfully.';
	$messages['moved'] = 'Filter moved successfully.';
	$messages['moveerror'] = 'Unable to move selected filter. Server error occurred.';
	$messages['nametoolong'] = 'Name too long.';
	$messages['namereserved'] = 'Reserved name.';
	$messages['setexist'] = 'Set already exists.';
	$messages['nodata'] = 'At least one position must be selected!';
	$messages['invaliddateformat'] = 'Invalid date or date part format';
	$messages['saveerror'] = 'Unable to save data. Server error occurred.';
	$messages['vacationsaved'] = 'Vacation data saved successfully.';
	$messages['emptyvacationbody'] = 'Body of vacation message is required!';
	$messages['duplicate.conflict.err'] = 'Both header and unique identifier are not allowed.';
	?>
	diff --git a/plugins/managesieve/localization/en_US.inc b/plugins/managesieve/localization/en_US.inc
	index 2e17dcee0..a1d36698b 100644
	--- a/plugins/managesieve/localization/en_US.inc
	+++ b/plugins/managesieve/localization/en_US.inc
	@@ -1,242 +1,243 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| plugins/managesieve/localization/<lang>.inc \|
	\| \|
	\| Localization file of the Roundcube Webmail Managesieve plugin \|
	\| Copyright (C) 2012-2013, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	+-----------------------------------------------------------------------+

	For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
	*/


	$labels['filters'] = 'Filters';
	$labels['managefilters'] = 'Manage incoming mail filters';
	$labels['filtername'] = 'Filter name';
	$labels['newfilter'] = 'New filter';
	$labels['filteradd'] = 'Add filter';
	$labels['filterdel'] = 'Delete filter';
	$labels['moveup'] = 'Move up';
	$labels['movedown'] = 'Move down';
	$labels['filterallof'] = 'matching all of the following rules';
	$labels['filteranyof'] = 'matching any of the following rules';
	$labels['filterany'] = 'all messages';
	$labels['filtercontains'] = 'contains';
	$labels['filternotcontains'] = 'not contains';
	$labels['filteris'] = 'is equal to';
	$labels['filterisnot'] = 'is not equal to';
	$labels['filterexists'] = 'exists';
	$labels['filternotexists'] = 'not exists';
	$labels['filtermatches'] = 'matches expression';
	$labels['filternotmatches'] = 'not matches expression';
	$labels['filterregex'] = 'matches regular expression';
	$labels['filternotregex'] = 'not matches regular expression';
	$labels['filterunder'] = 'under';
	$labels['filterover'] = 'over';
	$labels['addrule'] = 'Add rule';
	$labels['delrule'] = 'Delete rule';
	$labels['messagemoveto'] = 'Move message to';
	$labels['messageredirect'] = 'Redirect message to';
	$labels['messagecopyto'] = 'Copy message to';
	$labels['messagesendcopy'] = 'Send message copy to';
	$labels['messagereply'] = 'Reply with message';
	$labels['messagedelete'] = 'Delete message';
	$labels['messagediscard'] = 'Discard with message';
	$labels['messagekeep'] = 'Keep message in Inbox';
	$labels['messagesrules'] = 'For incoming mail:';
	$labels['messagesactions'] = '...execute the following actions:';
	$labels['add'] = 'Add';
	$labels['del'] = 'Delete';
	$labels['sender'] = 'Sender';
	$labels['recipient'] = 'Recipient';
	$labels['vacationaddr'] = 'My e-mail addresses:';
	$labels['vacationdays'] = 'How often send messages (in days):';
	$labels['vacationinterval'] = 'How often send messages:';
	$labels['vacationreason'] = 'Message body (vacation reason):';
	$labels['vacationfrom'] = 'Reply sender address:';
	$labels['vacationsubject'] = 'Message subject:';
	$labels['days'] = 'days';
	$labels['seconds'] = 'seconds';
	$labels['rulestop'] = 'Stop evaluating rules';
	$labels['enable'] = 'Enable/Disable';
	$labels['filterset'] = 'Filters set';
	$labels['filtersets'] = 'Filter sets';
	$labels['filtersetadd'] = 'Add filters set';
	$labels['filtersetdel'] = 'Delete current filters set';
	$labels['filtersetact'] = 'Activate current filters set';
	$labels['filtersetdeact'] = 'Deactivate current filters set';
	$labels['filterdef'] = 'Filter definition';
	$labels['filtersetname'] = 'Filters set name';
	$labels['newfilterset'] = 'New filters set';
	$labels['active'] = 'active';
	$labels['none'] = 'none';
	$labels['fromset'] = 'from set';
	$labels['fromfile'] = 'from file';
	$labels['filterdisabled'] = 'Filter disabled';
	$labels['countisgreaterthan'] = 'count is greater than';
	$labels['countisgreaterthanequal'] = 'count is greater than or equal to';
	$labels['countislessthan'] = 'count is less than';
	$labels['countislessthanequal'] = 'count is less than or equal to';
	$labels['countequals'] = 'count is equal to';
	$labels['countnotequals'] = 'count is not equal to';
	$labels['valueisgreaterthan'] = 'value is greater than';
	$labels['valueisgreaterthanequal'] = 'value is greater than or equal to';
	$labels['valueislessthan'] = 'value is less than';
	$labels['valueislessthanequal'] = 'value is less than or equal to';
	$labels['valueequals'] = 'value is equal to';
	$labels['valuenotequals'] = 'value is not equal to';
	$labels['setflags'] = 'Set flags to the message';
	$labels['addflags'] = 'Add flags to the message';
	$labels['removeflags'] = 'Remove flags from the message';
	$labels['flagread'] = 'Read';
	$labels['flagdeleted'] = 'Deleted';
	$labels['flaganswered'] = 'Answered';
	$labels['flagflagged'] = 'Flagged';
	$labels['flagdraft'] = 'Draft';
	$labels['setvariable'] = 'Set variable';
	$labels['setvarname'] = 'Variable name:';
	$labels['setvarvalue'] = 'Variable value:';
	$labels['setvarmodifiers'] = 'Modifiers:';
	$labels['varlower'] = 'lower-case';
	$labels['varupper'] = 'upper-case';
	$labels['varlowerfirst'] = 'first character lower-case';
	$labels['varupperfirst'] = 'first character upper-case';
	$labels['varquotewildcard'] = 'quote special characters';
	$labels['varlength'] = 'length';
	$labels['notify'] = 'Send notification';
	$labels['notifytarget'] = 'Notification target:';
	$labels['notifymessage'] = 'Notification message (optional):';
	$labels['notifyoptions'] = 'Notification options (optional):';
	$labels['notifyfrom'] = 'Notification sender (optional):';
	$labels['notifyimportance'] = 'Importance:';
	$labels['notifyimportancelow'] = 'low';
	$labels['notifyimportancenormal'] = 'normal';
	$labels['notifyimportancehigh'] = 'high';
	$labels['notifymethodmailto'] = 'Email';
	$labels['notifymethodtel'] = 'Phone';
	$labels['notifymethodsms'] = 'SMS';
	$labels['filtercreate'] = 'Create filter';
	$labels['usedata'] = 'Use following data in the filter:';
	$labels['nextstep'] = 'Next Step';
	$labels['...'] = '...';
	+$labels['string'] = 'String';
	$labels['currdate'] = 'Current date';
	$labels['datetest'] = 'Date';
	$labels['dateheader'] = 'header:';
	$labels['year'] = 'year';
	$labels['month'] = 'month';
	$labels['day'] = 'day';
	$labels['date'] = 'date (yyyy-mm-dd)';
	$labels['julian'] = 'date (julian)';
	$labels['hour'] = 'hour';
	$labels['minute'] = 'minute';
	$labels['second'] = 'second';
	$labels['time'] = 'time (hh:mm:ss)';
	$labels['iso8601'] = 'date (ISO8601)';
	$labels['std11'] = 'date (RFC2822)';
	$labels['zone'] = 'time-zone';
	$labels['weekday'] = 'weekday (0-6)';
	$labels['advancedopts'] = 'Advanced options';
	$labels['body'] = 'Body';
	$labels['address'] = 'address';
	$labels['envelope'] = 'envelope';
	$labels['modifier'] = 'modifier:';
	$labels['text'] = 'text';
	$labels['undecoded'] = 'undecoded (raw)';
	$labels['contenttype'] = 'content type';
	$labels['modtype'] = 'type:';
	$labels['allparts'] = 'all';
	$labels['domain'] = 'domain';
	$labels['localpart'] = 'local part';
	$labels['user'] = 'user';
	$labels['detail'] = 'detail';
	$labels['comparator'] = 'comparator:';
	$labels['default'] = 'default';
	$labels['octet'] = 'strict (octet)';
	$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
	$labels['asciinumeric'] = 'numeric (ascii-numeric)';
	$labels['index'] = 'index:';
	$labels['indexlast'] = 'backwards';
	$labels['vacation'] = 'Vacation';
	$labels['vacation.reply'] = 'Reply message';
	$labels['vacation.advanced'] = 'Advanced settings';
	$labels['vacation.from'] = 'Reply sender address';
	$labels['vacation.subject'] = 'Subject';
	$labels['vacation.body'] = 'Body';
	$labels['vacation.start'] = 'Vacation start';
	$labels['vacation.end'] = 'Vacation end';
	$labels['vacation.status'] = 'Status';
	$labels['vacation.on'] = 'On';
	$labels['vacation.off'] = 'Off';
	$labels['vacation.addresses'] = 'My e-mail addresses';
	$labels['vacation.interval'] = 'Reply interval';
	$labels['vacation.after'] = 'Put vacation rule after';
	$labels['vacation.saving'] = 'Saving data...';
	$labels['vacation.action'] = 'Incoming message action';
	$labels['vacation.keep'] = 'Keep';
	$labels['vacation.discard'] = 'Discard';
	$labels['vacation.redirect'] = 'Redirect to';
	$labels['vacation.copy'] = 'Send copy to';
	$labels['filladdresses'] = 'Fill with all my addresses';
	$labels['arialabelfiltersetactions'] = 'Filter set actions';
	$labels['arialabelfilteractions'] = 'Filter actions';
	$labels['arialabelfilterform'] = 'Filter properties';
	$labels['ariasummaryfilterslist'] = 'List of filters';
	$labels['ariasummaryfiltersetslist'] = 'List of filter sets';
	$labels['filterstitle'] = 'Edit incoming mail filters';
	$labels['vacationtitle'] = 'Edit out-of-office rule';
	$labels['message'] = 'Message';
	$labels['duplicate'] = 'is duplicate';
	$labels['notduplicate'] = 'is not duplicate';
	$labels['duplicate.handle'] = 'handle:';
	$labels['duplicate.header'] = 'header:';
	$labels['duplicate.uniqueid'] = 'identifier:';
	$labels['duplicate.seconds'] = 'timeout (seconds):';
	$labels['duplicate.last'] = 'relative to the last execution';

	$messages = array();
	$messages['filterunknownerror'] = 'Unknown server error.';
	$messages['filterconnerror'] = 'Unable to connect to server.';
	$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occurred.';
	$messages['filterdeleted'] = 'Filter deleted successfully.';
	$messages['filtersaved'] = 'Filter saved successfully.';
	$messages['filtersaveerror'] = 'Unable to save filter. Server error occurred.';
	$messages['filterformerror'] = 'Filter form contains errors.';
	$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
	$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
	$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
	$messages['forbiddenchars'] = 'Forbidden characters in field.';
	$messages['cannotbeempty'] = 'Field cannot be empty.';
	$messages['ruleexist'] = 'Filter with specified name already exists.';
	$messages['setactivateerror'] = 'Unable to activate selected filters set. Server error occurred.';
	$messages['setdeactivateerror'] = 'Unable to deactivate selected filters set. Server error occurred.';
	$messages['setdeleteerror'] = 'Unable to delete selected filters set. Server error occurred.';
	$messages['setactivated'] = 'Filters set activated successfully.';
	$messages['setdeactivated'] = 'Filters set deactivated successfully.';
	$messages['setdeleted'] = 'Filters set deleted successfully.';
	$messages['setdeleteconfirm'] = 'Are you sure, you want to delete selected filters set?';
	$messages['setcreateerror'] = 'Unable to create filters set. Server error occurred.';
	$messages['setcreated'] = 'Filters set created successfully.';
	$messages['activateerror'] = 'Unable to enable selected filter(s). Server error occurred.';
	$messages['deactivateerror'] = 'Unable to disable selected filter(s). Server error occurred.';
	$messages['deactivated'] = 'Filter(s) disabled successfully.';
	$messages['activated'] = 'Filter(s) enabled successfully.';
	$messages['moved'] = 'Filter moved successfully.';
	$messages['moveerror'] = 'Unable to move selected filter. Server error occurred.';
	$messages['nametoolong'] = 'Name too long.';
	$messages['namereserved'] = 'Reserved name.';
	$messages['setexist'] = 'Set already exists.';
	$messages['nodata'] = 'At least one position must be selected!';
	$messages['invaliddateformat'] = 'Invalid date or date part format';
	$messages['saveerror'] = 'Unable to save data. Server error occurred.';
	$messages['vacationsaved'] = 'Vacation data saved successfully.';
	$messages['emptyvacationbody'] = 'Body of vacation message is required!';
	$messages['duplicate.conflict.err'] = 'Both header and unique identifier are not allowed.';

	?>
	diff --git a/plugins/managesieve/localization/fr_FR.inc b/plugins/managesieve/localization/fr_FR.inc
	index 7643ae520..429f4ad52 100644
	--- a/plugins/managesieve/localization/fr_FR.inc
	+++ b/plugins/managesieve/localization/fr_FR.inc
	@@ -1,237 +1,238 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| plugins/managesieve/localization/<lang>.inc \|
	\| \|
	\| Localization file of the Roundcube Webmail Managesieve plugin \|
	\| Copyright (C) 2012-2013, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	+-----------------------------------------------------------------------+

	For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
	*/
	$labels['filters'] = 'Filtres';
	$labels['managefilters'] = 'Gérer les filtres de courriels entrants';
	$labels['filtername'] = 'Nom du filtre';
	$labels['newfilter'] = 'Nouveau filtre';
	$labels['filteradd'] = 'Ajouter un filtre';
	$labels['filterdel'] = 'Supprimer le filtre';
	$labels['moveup'] = 'Monter';
	$labels['movedown'] = 'Descendre';
	$labels['filterallof'] = 'correspondant à toutes les règles suivantes';
	$labels['filteranyof'] = 'valident au moins une des conditions suivantes';
	$labels['filterany'] = 'tous les courriels';
	$labels['filtercontains'] = 'contient';
	$labels['filternotcontains'] = 'ne contient pas';
	$labels['filteris'] = 'est égal à';
	$labels['filterisnot'] = 'est différent de';
	$labels['filterexists'] = 'existe';
	$labels['filternotexists'] = 'n\'existe pas';
	$labels['filtermatches'] = 'correspond à l\'expression';
	$labels['filternotmatches'] = 'ne correspond pas à l\'expression';
	$labels['filterregex'] = 'correspond à l\'expression rationnelle';
	$labels['filternotregex'] = 'ne correspond pas à l\'expression rationnelle';
	$labels['filterunder'] = 'plus petit que';
	$labels['filterover'] = 'plus grand que';
	$labels['addrule'] = 'Ajouter une règle';
	$labels['delrule'] = 'Supprimer une règle';
	$labels['messagemoveto'] = 'Déplacer le courriel vers';
	$labels['messageredirect'] = 'Rediriger le courriel vers';
	$labels['messagecopyto'] = 'Copier le courriel vers';
	$labels['messagesendcopy'] = 'Envoyer une copie du courriel à';
	$labels['messagereply'] = 'Répondre avec le courriel';
	$labels['messagedelete'] = 'Supprimer le courriel';
	$labels['messagediscard'] = 'Rejeter avec le courriel';
	$labels['messagekeep'] = 'Conserver le courriel dans la boîte de réception';
	$labels['messagesrules'] = 'Pour les courriels entrants :';
	$labels['messagesactions'] = '...exécuter les actions suivantes :';
	$labels['add'] = 'Ajouter';
	$labels['del'] = 'Supprimer';
	$labels['sender'] = 'Expéditeur';
	$labels['recipient'] = 'Destinataire';
	$labels['vacationaddr'] = 'Mes adresses courriel :';
	$labels['vacationdays'] = 'Fréquence d\'envoi des courriels (en jours) :';
	$labels['vacationinterval'] = 'Fréquence d\'envoi des courriels :';
	$labels['vacationreason'] = 'Corps du courriel (raison de l\'absence) :';
	$labels['vacationfrom'] = 'Adresse de réponse de l\'expéditeur :';
	$labels['vacationsubject'] = 'Objet du courriel :';
	$labels['days'] = 'jours';
	$labels['seconds'] = 'secondes';
	$labels['rulestop'] = 'Arrêter l\'évaluation des règles';
	$labels['enable'] = 'Activer/désactiver';
	$labels['filterset'] = 'Jeu de filtres';
	$labels['filtersets'] = 'Jeux de filtres';
	$labels['filtersetadd'] = 'Ajouter un jeu de filtres';
	$labels['filtersetdel'] = 'Supprimer le jeu de filtres actuel';
	$labels['filtersetact'] = 'Activer le jeu de filtres actuel';
	$labels['filtersetdeact'] = 'Désactiver le jeu de filtres actuel';
	$labels['filterdef'] = 'Définition du filtre';
	$labels['filtersetname'] = 'Nom du jeu de filtres';
	$labels['newfilterset'] = 'Nouveau jeu de filtres';
	$labels['active'] = 'activer';
	$labels['none'] = 'aucun';
	$labels['fromset'] = 'à partir du jeu';
	$labels['fromfile'] = 'à partir du fichier';
	$labels['filterdisabled'] = 'Filtre désactivé';
	$labels['countisgreaterthan'] = 'total supérieur à';
	$labels['countisgreaterthanequal'] = 'total supérieur ou égal à';
	$labels['countislessthan'] = 'total inférieur à';
	$labels['countislessthanequal'] = 'total inférieur ou égal à';
	$labels['countequals'] = 'total égal à';
	$labels['countnotequals'] = 'le nombre n\'est pas égal à';
	$labels['valueisgreaterthan'] = 'valeur supérieure à';
	$labels['valueisgreaterthanequal'] = 'valeur supérieure ou égale à';
	$labels['valueislessthan'] = 'valeur inférieure à';
	$labels['valueislessthanequal'] = 'valeur inférieure ou égale à';
	$labels['valueequals'] = 'valeur égale à';
	$labels['valuenotequals'] = 'la valeur n\'est pas égale à';
	$labels['setflags'] = 'Définir les drapeaux pour le courriel';
	$labels['addflags'] = 'Ajouter les drapeaux au courriel';
	$labels['removeflags'] = 'Supprimer les drapeaux du courriel';
	$labels['flagread'] = 'Lu';
	$labels['flagdeleted'] = 'Supprimé';
	$labels['flaganswered'] = 'Réponse envoyée';
	$labels['flagflagged'] = 'Signalé';
	$labels['flagdraft'] = 'Brouillon';
	$labels['setvariable'] = 'Définir une variable';
	$labels['setvarname'] = 'Nom de la variable :';
	$labels['setvarvalue'] = 'Valeur de la variable :';
	$labels['setvarmodifiers'] = 'Modificateurs :';
	$labels['varlower'] = 'minuscule';
	$labels['varupper'] = 'majuscule';
	$labels['varlowerfirst'] = 'premier caractère en minuscule';
	$labels['varupperfirst'] = 'premier caractère en majuscule';
	$labels['varquotewildcard'] = 'citer les caractères spéciaux';
	$labels['varlength'] = 'longueur';
	$labels['notify'] = 'Envoyer la notification';
	$labels['notifytarget'] = 'Cible de la notification :';
	$labels['notifymessage'] = 'Courriel de notification (optionnel) :';
	$labels['notifyoptions'] = 'Options de notification (optionnel) :';
	$labels['notifyfrom'] = 'Expéditeur de la notification (optionnel) :';
	$labels['notifyimportance'] = 'Importance :';
	$labels['notifyimportancelow'] = 'faible';
	$labels['notifyimportancenormal'] = 'normale';
	$labels['notifyimportancehigh'] = 'haute';
	$labels['notifymethodmailto'] = 'Courriel';
	$labels['notifymethodtel'] = 'Téléphone';
	$labels['notifymethodsms'] = 'Texto';
	$labels['filtercreate'] = 'Créer un filtre';
	$labels['usedata'] = 'Utiliser les données suivantes dans le filtre :';
	$labels['nextstep'] = 'Étape suivante';
	$labels['...'] = '...';
	+$labels['string'] = 'Chaîne';
	$labels['currdate'] = 'Date actuelle';
	$labels['datetest'] = 'Date';
	$labels['dateheader'] = 'en-tête :';
	$labels['year'] = 'année';
	$labels['month'] = 'mois';
	$labels['day'] = 'jour';
	$labels['date'] = 'date (aaaa-mm-jj)';
	$labels['julian'] = 'date (julien)';
	$labels['hour'] = 'heure';
	$labels['minute'] = 'minute';
	$labels['second'] = 'seconde';
	$labels['time'] = 'heure (hh:mm:ss)';
	$labels['iso8601'] = 'date (ISO8601)';
	$labels['std11'] = 'date (RFC2822)';
	$labels['zone'] = 'fuseau horaire';
	$labels['weekday'] = 'jour de la semaine (0-6)';
	$labels['advancedopts'] = 'Options avancées';
	$labels['body'] = 'Corps';
	$labels['address'] = 'adresse';
	$labels['envelope'] = 'enveloppe';
	$labels['modifier'] = 'modificateur :';
	$labels['text'] = 'texte';
	$labels['undecoded'] = 'non décodé (brut)';
	$labels['contenttype'] = 'type de contenu';
	$labels['modtype'] = 'type :';
	$labels['allparts'] = 'tout';
	$labels['domain'] = 'domaine';
	$labels['localpart'] = 'partie locale';
	$labels['user'] = 'utilisateur';
	$labels['detail'] = 'détail';
	$labels['comparator'] = 'comparateur :';
	$labels['default'] = 'par défaut';
	$labels['octet'] = 'strict (octet)';
	$labels['asciicasemap'] = 'insensible à la casse (ascii-casemap)';
	$labels['asciinumeric'] = 'numérique (ascii-numeric)';
	$labels['index'] = 'index :';
	$labels['indexlast'] = 'à l\'envers';
	$labels['vacation'] = 'Vacances';
	$labels['vacation.reply'] = 'Courriel de réponse';
	$labels['vacation.advanced'] = 'Paramètres avancés';
	$labels['vacation.from'] = 'Adresse de réponse de l\'expéditeur';
	$labels['vacation.subject'] = 'Objet';
	$labels['vacation.body'] = 'Corps';
	$labels['vacation.start'] = 'Début de vacances';
	$labels['vacation.end'] = 'Fin de vacances';
	$labels['vacation.status'] = 'État';
	$labels['vacation.on'] = 'Marche';
	$labels['vacation.off'] = 'Arrêt';
	$labels['vacation.addresses'] = 'Mes adresses courriel';
	$labels['vacation.interval'] = 'Plage de réponse';
	$labels['vacation.after'] = 'Mettre en place la règle de vacances après';
	$labels['vacation.saving'] = 'Enregistrement des données...';
	$labels['vacation.action'] = 'Action pour courriel entrant';
	$labels['vacation.keep'] = 'Garder';
	$labels['vacation.discard'] = 'Rejeter';
	$labels['vacation.redirect'] = 'Réacheminer à';
	$labels['vacation.copy'] = 'Envoyer une copie à';
	$labels['filladdresses'] = 'Remplir avec toutes mes adresses';
	$labels['arialabelfiltersetactions'] = 'Actions des jeux de filtrage';
	$labels['arialabelfilteractions'] = 'Actions de filtrage';
	$labels['arialabelfilterform'] = 'Propriété du filtrage';
	$labels['ariasummaryfilterslist'] = 'Liste des filtres';
	$labels['ariasummaryfiltersetslist'] = 'Liste des jeux de filtrage';
	$labels['filterstitle'] = 'Modifier les filtres de courriels entrants';
	$labels['vacationtitle'] = 'Modifier la règle d\'absence du bureau';
	$labels['message'] = 'Message';
	$labels['duplicate'] = 'est un doublon';
	$labels['notduplicate'] = 'n\'est pas un doublon';
	$labels['duplicate.handle'] = 'descripteur :';
	$labels['duplicate.header'] = 'en-tête :';
	$labels['duplicate.uniqueid'] = 'identifiant :';
	$labels['duplicate.seconds'] = 'temporisation (secondes) :';
	$labels['duplicate.last'] = 'par rapport à la dernière exécution';
	$messages['filterunknownerror'] = 'Erreur de serveur inconnue';
	$messages['filterconnerror'] = 'Connexion au serveur impossible.';
	$messages['filterdeleteerror'] = 'Impossible de supprimer le filtre. Une erreur de serveur est survenue.';
	$messages['filterdeleted'] = 'Le filtre a été supprimé avec succès.';
	$messages['filtersaved'] = 'Le filtre a été enregistré avec succès.';
	$messages['filtersaveerror'] = 'Impossible d\'enregistrer le filtre. Une erreur de serveur est survenue.';
	$messages['filterformerror'] = 'Le formulaire de filtrage contient des erreurs.';
	$messages['filterdeleteconfirm'] = 'Voulez-vous vraiment supprimer le filtre sélectionné ?';
	$messages['ruledeleteconfirm'] = 'Voulez-vous vraiment supprimer la règle sélectionnée ?';
	$messages['actiondeleteconfirm'] = 'Voulez-vous vraiment supprimer l\'action sélectionnée ?';
	$messages['forbiddenchars'] = 'Caractères interdits dans le champ';
	$messages['cannotbeempty'] = 'Le champ ne peut pas être vide';
	$messages['ruleexist'] = 'Un filtre existe déjà avec ce nom.';
	$messages['setactivateerror'] = 'Impossible d\'activer le jeu de filtres sélectionné. Une erreur de serveur est survenue.';
	$messages['setdeactivateerror'] = 'Impossible de désactiver le jeu de filtres sélectionné. Une erreur de serveur est survenue.';
	$messages['setdeleteerror'] = 'Impossible de supprimer le jeu de filtres sélectionné. Une erreur de serveur est survenue.';
	$messages['setactivated'] = 'Le jeu de filtres a été activé avec succès.';
	$messages['setdeactivated'] = 'Le jeu de filtres a été désactivé avec succès.';
	$messages['setdeleted'] = 'Le jeu de filtres a été supprimé avec succès.';
	$messages['setdeleteconfirm'] = 'Voulez vous vraiment supprimer le jeu de filtres sélectionné ?';
	$messages['setcreateerror'] = 'Impossible de créer un jeu de filtres. Une erreur de serveur est survenue.';
	$messages['setcreated'] = 'Le jeu de filtres a été créé avec succès.';
	$messages['activateerror'] = 'Impossible d\'activer le/les filtre(s) sélectionné(s). Une erreur de serveur est survenue.';
	$messages['deactivateerror'] = 'Impossible de désactiver le/les filtre(s) sélectionné(s). Une erreur de serveur est survenue.';
	$messages['deactivated'] = 'Filtres désactivés avec succès.';
	$messages['activated'] = 'Filtres activés avec succès.';
	$messages['moved'] = 'Filtre déplacé avec succès.';
	$messages['moveerror'] = 'Impossible de déplacer le filtre sélectionné. Une erreur de serveur est survenue.';
	$messages['nametoolong'] = 'Nom trop long.';
	$messages['namereserved'] = 'Nom réservé.';
	$messages['setexist'] = 'Le jeu existe déjà.';
	$messages['nodata'] = 'Au moins un élément doit être sélectionné !';
	$messages['invaliddateformat'] = 'Format de date ou d\'une partie de la date invalide';
	$messages['saveerror'] = 'Impossible d\'enregistrer les données. Une erreur du serveur est survenue.';
	$messages['vacationsaved'] = 'Les données de vacances ont été enregistrées avec succès.';
	$messages['emptyvacationbody'] = 'Le corps du courriel de vacances est exigé !';
	$messages['duplicate.conflict.err'] = 'L\'en-tête et l\'identifiant unique ne sont pas permis.';
	?>
	diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js
	index 1316a5aa5..cfc60db7f 100644
	--- a/plugins/managesieve/managesieve.js
	+++ b/plugins/managesieve/managesieve.js
	@@ -1,1078 +1,1083 @@
	/**
	* (Manage)Sieve Filters plugin
	*
	* @licstart The following is the entire license notice for the
	* JavaScript code in this file.
	*
	* Copyright (c) 2012-2014, The Roundcube Dev Team
	*
	* The JavaScript code in this page is free software: you can redistribute it
	* and/or modify it under the terms of the GNU General Public License
	* as published by the Free Software Foundation, either version 3 of
	* the License, or (at your option) any later version.
	*
	* @licend The above is the entire license notice
	* for the JavaScript code in this file.
	*/

	if (window.rcmail) {
	rcmail.addEventListener('init', function(evt) {
	// add managesieve-create command to message_commands array,
	// so it's state will be updated on message selection/unselection
	if (rcmail.env.task == 'mail') {
	if (rcmail.env.action != 'show')
	rcmail.env.message_commands.push('managesieve-create');
	else
	rcmail.enable_command('managesieve-create', true);
	}

	if (rcmail.env.task == 'mail' \|\| rcmail.env.action.startsWith('plugin.managesieve')) {
	// Create layer for form tips
	if (!rcmail.env.framed) {
	rcmail.env.ms_tip_layer = $('<div id="managesieve-tip" class="popupmenu"></div>');
	rcmail.env.ms_tip_layer.appendTo(document.body);
	}
	}

	// register commands
	rcmail.register_command('plugin.managesieve-save', function() { rcmail.managesieve_save() });
	rcmail.register_command('plugin.managesieve-act', function() { rcmail.managesieve_act() });
	rcmail.register_command('plugin.managesieve-add', function() { rcmail.managesieve_add() });
	rcmail.register_command('plugin.managesieve-del', function() { rcmail.managesieve_del() });
	rcmail.register_command('plugin.managesieve-move', function() { rcmail.managesieve_move() });
	rcmail.register_command('plugin.managesieve-setadd', function() { rcmail.managesieve_setadd() });
	rcmail.register_command('plugin.managesieve-setdel', function() { rcmail.managesieve_setdel() });
	rcmail.register_command('plugin.managesieve-setact', function() { rcmail.managesieve_setact() });
	rcmail.register_command('plugin.managesieve-setget', function() { rcmail.managesieve_setget() });

	if (rcmail.env.action.startsWith('plugin.managesieve')) {
	if (rcmail.gui_objects.sieveform) {
	rcmail.enable_command('plugin.managesieve-save', true);
	sieve_form_init();
	}
	else {
	rcmail.enable_command('plugin.managesieve-add', 'plugin.managesieve-setadd', !rcmail.env.sieveconnerror);
	}

	var setcnt, set = rcmail.env.currentset;

	if (rcmail.gui_objects.filterslist) {
	rcmail.filters_list = new rcube_list_widget(rcmail.gui_objects.filterslist,
	{multiselect:false, draggable:true, keyboard:true});

	rcmail.filters_list
	.addEventListener('select', function(e) { rcmail.managesieve_select(e); })
	.addEventListener('dragstart', function(e) { rcmail.managesieve_dragstart(e); })
	.addEventListener('dragend', function(e) { rcmail.managesieve_dragend(e); })
	.addEventListener('initrow', function(row) {
	row.obj.onmouseover = function() { rcmail.managesieve_focus_filter(row); };
	row.obj.onmouseout = function() { rcmail.managesieve_unfocus_filter(row); };
	})
	.init();
	}

	if (rcmail.gui_objects.filtersetslist) {
	rcmail.filtersets_list = new rcube_list_widget(rcmail.gui_objects.filtersetslist,
	{multiselect:false, draggable:false, keyboard:true});

	rcmail.filtersets_list.init().focus();

	if (set != null) {
	set = rcmail.managesieve_setid(set);
	rcmail.filtersets_list.select(set);
	}

	// attach select event after initial record was selected
	rcmail.filtersets_list.addEventListener('select', function(e) { rcmail.managesieve_setselect(e); });

	setcnt = rcmail.filtersets_list.rowcount;
	rcmail.enable_command('plugin.managesieve-set', true);
	rcmail.enable_command('plugin.managesieve-setact', 'plugin.managesieve-setget', setcnt);
	rcmail.enable_command('plugin.managesieve-setdel', setcnt > 1);

	// Fix dragging filters over sets list
	$('tr', rcmail.gui_objects.filtersetslist).each(function (i, e) { rcmail.managesieve_fixdragend(e); });
	}
	}

	if (rcmail.gui_objects.sieveform && rcmail.env.rule_disabled)
	$('#disabled').attr('checked', true);
	});
	};

	/*********************************************************/
	/******* Managesieve UI methods *******/
	/*********************************************************/

	rcube_webmail.prototype.managesieve_add = function()
	{
	this.load_managesieveframe();
	this.filters_list.clear_selection();
	};

	rcube_webmail.prototype.managesieve_del = function()
	{
	var id = this.filters_list.get_single_selection();
	if (confirm(this.get_label('managesieve.filterdeleteconfirm'))) {
	var lock = this.set_busy(true, 'loading');
	this.http_post('plugin.managesieve-action',
	'_act=delete&_fid='+this.filters_list.rows[id].uid, lock);
	}
	};

	rcube_webmail.prototype.managesieve_act = function()
	{
	var id = this.filters_list.get_single_selection(),
	lock = this.set_busy(true, 'loading');

	this.http_post('plugin.managesieve-action',
	'_act=act&_fid='+this.filters_list.rows[id].uid, lock);
	};

	// Filter selection
	rcube_webmail.prototype.managesieve_select = function(list)
	{
	var id = list.get_single_selection();
	if (id != null)
	this.load_managesieveframe(list.rows[id].uid);
	};

	// Set selection
	rcube_webmail.prototype.managesieve_setselect = function(list)
	{
	this.show_contentframe(false);
	this.filters_list.clear(true);
	this.enable_command('plugin.managesieve-setdel', list.rowcount > 1);
	this.enable_command('plugin.managesieve-setact', 'plugin.managesieve-setget', true);

	var id = list.get_single_selection();
	if (id != null)
	this.managesieve_list(this.env.filtersets[id]);
	};

	rcube_webmail.prototype.managesieve_rowid = function(id)
	{
	var i, rows = this.filters_list.rows;

	for (i in rows)
	if (rows[i] != null && rows[i].uid == id)
	return i;
	};

	// Returns set's identifier
	rcube_webmail.prototype.managesieve_setid = function(name)
	{
	for (var i in this.env.filtersets)
	if (this.env.filtersets[i] == name)
	return i;
	};

	// Filters listing request
	rcube_webmail.prototype.managesieve_list = function(script)
	{
	var lock = this.set_busy(true, 'loading');

	this.http_post('plugin.managesieve-action', '_act=list&_set='+urlencode(script), lock);
	};

	// Script download request
	rcube_webmail.prototype.managesieve_setget = function()
	{
	var id = this.filtersets_list.get_single_selection(),
	script = this.env.filtersets[id];

	this.goto_url('plugin.managesieve-action', {_act: 'setget', _set: script}, false, true);
	};

	// Set activate/deactivate request
	rcube_webmail.prototype.managesieve_setact = function()
	{
	var id = this.filtersets_list.get_single_selection(),
	lock = this.set_busy(true, 'loading'),
	script = this.env.filtersets[id],
	action = $('#rcmrow'+id).hasClass('disabled') ? 'setact' : 'deact';

	this.http_post('plugin.managesieve-action', '_act='+action+'&_set='+urlencode(script), lock);
	};

	// Set delete request
	rcube_webmail.prototype.managesieve_setdel = function()
	{
	if (!confirm(this.get_label('managesieve.setdeleteconfirm')))
	return false;

	var id = this.filtersets_list.get_single_selection(),
	lock = this.set_busy(true, 'loading'),
	script = this.env.filtersets[id];

	this.http_post('plugin.managesieve-action', '_act=setdel&_set='+urlencode(script), lock);
	};

	// Set add request
	rcube_webmail.prototype.managesieve_setadd = function()
	{
	this.filters_list.clear_selection();
	this.enable_command('plugin.managesieve-act', 'plugin.managesieve-del', false);

	if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
	var lock = this.set_busy(true, 'loading');
	target = window.frames[this.env.contentframe];
	target.location.href = this.env.comm_path+'&_action=plugin.managesieve-action&_framed=1&_newset=1&_unlock='+lock;
	}
	};

	rcube_webmail.prototype.managesieve_updatelist = function(action, o)
	{
	this.set_busy(true);

	switch (action) {
	// Delete filter row
	case 'del':
	var id = o.id, list = this.filters_list;

	list.remove_row(this.managesieve_rowid(o.id));
	list.clear_selection();
	this.show_contentframe(false);
	this.enable_command('plugin.managesieve-del', 'plugin.managesieve-act', false);

	// filter identifiers changed, fix the list
	$('tr', this.filters_list.list).each(function() {
	// remove hidden (deleted) rows
	if (this.style.display == 'none') {
	$(this).detach();
	return;
	}

	var rowid = this.id.substr(6);

	// remove all attached events
	$(this).off();

	// update row id
	if (rowid > id) {
	this.uid = rowid - 1;
	$(this).attr('id', 'rcmrow' + this.uid);
	}
	});
	list.init();

	break;

	// Update filter row
	case 'update':
	var i, row = $('#rcmrow'+this.managesieve_rowid(o.id));

	if (o.name)
	$('td', row).text(o.name);
	if (o.disabled)
	row.addClass('disabled');
	else
	row.removeClass('disabled');

	$('#disabled', $('iframe').contents()).prop('checked', o.disabled);

	break;

	// Add filter row to the list
	case 'add':
	var list = this.filters_list,
	row = $('<tr><td class="name"></td></tr>');

	$('td', row).text(o.name);
	row.attr('id', 'rcmrow'+o.id);
	if (o.disabled)
	row.addClass('disabled');

	list.insert_row(row.get(0));
	list.highlight_row(o.id);

	this.enable_command('plugin.managesieve-del', 'plugin.managesieve-act', true);

	break;

	// Filling rules list
	case 'list':
	var i, tr, td, el, list = this.filters_list;

	if (o.clear)
	list.clear();

	for (i in o.list) {
	el = o.list[i];
	tr = document.createElement('TR');
	td = document.createElement('TD');

	$(td).text(el.name);
	td.className = 'name';
	tr.id = 'rcmrow' + el.id;
	if (el['class'])
	tr.className = el['class'];
	tr.appendChild(td);

	list.insert_row(tr);
	}

	if (o.set)
	list.highlight_row(o.set);
	else
	this.enable_command('plugin.managesieve-del', 'plugin.managesieve-act', false);

	break;

	// Sactivate/deactivate set
	case 'setact':
	var id = this.managesieve_setid(o.name), row = $('#rcmrow' + id);
	if (o.active) {
	if (o.all)
	$('tr', this.gui_objects.filtersetslist).addClass('disabled');
	row.removeClass('disabled');
	}
	else
	row.addClass('disabled');

	break;

	// Delete set row
	case 'setdel':
	var id = this.managesieve_setid(o.name);

	this.filtersets_list.remove_row(id);
	this.filters_list.clear();
	this.show_contentframe(false);
	this.enable_command('plugin.managesieve-setdel', 'plugin.managesieve-setact', 'plugin.managesieve-setget', false);

	delete this.env.filtersets[id];

	break;

	// Create set row
	case 'setadd':
	var id = 'S' + new Date().getTime(),
	list = this.filtersets_list,
	row = $('<tr class="disabled"><td class="name"></td></tr>');

	$('td', row).text(o.name);
	row.attr('id', 'rcmrow'+id);

	this.env.filtersets[id] = o.name;
	list.insert_row(row.get(0));

	// move row into its position on the list
	if (o.index != list.rowcount-1) {
	row.detach();
	var elem = $('tr:visible', list.list).get(o.index);
	row.insertBefore(elem);
	}

	list.select(id);

	// Fix dragging filters over sets list
	this.managesieve_fixdragend(row);

	break;
	}

	this.set_busy(false);
	};

	// load filter frame
	rcube_webmail.prototype.load_managesieveframe = function(id)
	{
	var has_id = typeof(id) != 'undefined' && id != null;
	this.enable_command('plugin.managesieve-act', 'plugin.managesieve-del', has_id);

	if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
	target = window.frames[this.env.contentframe];
	var msgid = this.set_busy(true, 'loading');
	target.location.href = this.env.comm_path+'&_action=plugin.managesieve-action&_framed=1'
	+(has_id ? '&_fid='+id : '')+'&_unlock='+msgid;
	}
	};

	// load filter frame
	rcube_webmail.prototype.managesieve_dragstart = function(list)
	{
	var id = this.filters_list.get_single_selection();

	this.drag_active = true;
	this.drag_filter = id;
	};

	rcube_webmail.prototype.managesieve_dragend = function(e)
	{
	if (this.drag_active) {
	if (this.drag_filter_target) {
	var lock = this.set_busy(true, 'loading');

	this.show_contentframe(false);
	this.http_post('plugin.managesieve-action', '_act=move&_fid='+this.drag_filter
	+'&_to='+this.drag_filter_target, lock);
	}
	this.drag_active = false;
	}
	};

	// Fixes filters dragging over sets list
	// @TODO: to be removed after implementing copying filters
	rcube_webmail.prototype.managesieve_fixdragend = function(elem)
	{
	var p = this;
	$(elem).on('mouseup' + ((bw.iphone \|\| bw.ipad) ? ' touchend' : ''), function(e) {
	if (p.drag_active)
	p.filters_list.drag_mouse_up(e);
	});
	};

	rcube_webmail.prototype.managesieve_focus_filter = function(row)
	{
	var id = row.id.replace(/^rcmrow/, '');
	if (this.drag_active && id != this.drag_filter) {
	this.drag_filter_target = id;
	$(row.obj).addClass(id < this.drag_filter ? 'filtermoveup' : 'filtermovedown');
	}
	};

	rcube_webmail.prototype.managesieve_unfocus_filter = function(row)
	{
	if (this.drag_active) {
	$(row.obj).removeClass('filtermoveup filtermovedown');
	this.drag_filter_target = null;
	}
	};

	/*********************************************************/
	/******* Filter Form methods *******/
	/*********************************************************/

	// Form submition
	rcube_webmail.prototype.managesieve_save = function()
	{
	if (this.env.action == 'plugin.managesieve-vacation') {
	var data = $(this.gui_objects.sieveform).serialize();
	this.http_post('plugin.managesieve-vacation', data, this.display_message(this.get_label('managesieve.vacation.saving'), 'loading'));
	return;
	}

	if (parent.rcmail && parent.rcmail.filters_list && this.gui_objects.sieveform.name != 'filtersetform') {
	var id = parent.rcmail.filters_list.get_single_selection();
	if (id != null)
	this.gui_objects.sieveform.elements['_fid'].value = parent.rcmail.filters_list.rows[id].uid;
	}
	this.gui_objects.sieveform.submit();
	};

	// Operations on filters form
	rcube_webmail.prototype.managesieve_ruleadd = function(id)
	{
	this.http_post('plugin.managesieve-action', '_act=ruleadd&_rid='+id);
	};

	rcube_webmail.prototype.managesieve_rulefill = function(content, id, after)
	{
	if (content != '') {
	// create new element
	var div = document.getElementById('rules'),
	row = document.createElement('div');

	this.managesieve_insertrow(div, row, after);
	// fill row after inserting (for IE)
	row.setAttribute('id', 'rulerow'+id);
	row.className = 'rulerow';
	row.innerHTML = content;

	// initialize smart list inputs
	$('textarea[data-type="list"]', row).each(function() {
	smart_field_init(this);
	});

	this.managesieve_formbuttons(div);
	}
	};

	rcube_webmail.prototype.managesieve_ruledel = function(id)
	{
	if ($('#ruledel'+id).hasClass('disabled'))
	return;

	if (confirm(this.get_label('managesieve.ruledeleteconfirm'))) {
	var row = document.getElementById('rulerow'+id);
	row.parentNode.removeChild(row);
	this.managesieve_formbuttons(document.getElementById('rules'));
	}
	};

	rcube_webmail.prototype.managesieve_actionadd = function(id)
	{
	this.http_post('plugin.managesieve-action', '_act=actionadd&_aid='+id);
	};

	rcube_webmail.prototype.managesieve_actionfill = function(content, id, after)
	{
	if (content != '') {
	var div = document.getElementById('actions'),
	row = document.createElement('div');

	this.managesieve_insertrow(div, row, after);
	// fill row after inserting (for IE)
	row.className = 'actionrow';
	row.setAttribute('id', 'actionrow'+id);
	row.innerHTML = content;

	// initialize smart list inputs
	$('textarea[data-type="list"]', row).each(function() {
	smart_field_init(this);
	});

	this.managesieve_formbuttons(div);
	}
	};

	rcube_webmail.prototype.managesieve_actiondel = function(id)
	{
	if ($('#actiondel'+id).hasClass('disabled'))
	return;

	if (confirm(this.get_label('managesieve.actiondeleteconfirm'))) {
	var row = document.getElementById('actionrow'+id);
	row.parentNode.removeChild(row);
	this.managesieve_formbuttons(document.getElementById('actions'));
	}
	};

	// insert rule/action row in specified place on the list
	rcube_webmail.prototype.managesieve_insertrow = function(div, row, after)
	{
	for (var i=0; i<div.childNodes.length; i++) {
	if (div.childNodes[i].id == (div.id == 'rules' ? 'rulerow' : 'actionrow') + after)
	break;
	}

	if (div.childNodes[i+1])
	div.insertBefore(row, div.childNodes[i+1]);
	else
	div.appendChild(row);
	};

	// update Delete buttons status
	rcube_webmail.prototype.managesieve_formbuttons = function(div)
	{
	var i, button, buttons = [];

	// count and get buttons
	for (i=0; i<div.childNodes.length; i++) {
	if (div.id == 'rules' && div.childNodes[i].id) {
	if (/rulerow/.test(div.childNodes[i].id))
	buttons.push('ruledel' + div.childNodes[i].id.replace(/rulerow/, ''));
	}
	else if (div.childNodes[i].id) {
	if (/actionrow/.test(div.childNodes[i].id))
	buttons.push( 'actiondel' + div.childNodes[i].id.replace(/actionrow/, ''));
	}
	}

	for (i=0; i<buttons.length; i++) {
	button = document.getElementById(buttons[i]);
	if (i>0 \|\| buttons.length>1) {
	$(button).removeClass('disabled');
	}
	else {
	$(button).addClass('disabled');
	}
	}
	};

	// update vacation addresses field with user identities
	rcube_webmail.prototype.managesieve_vacation_addresses = function(id)
	{
	var lock = this.set_busy(true, 'loading');
	this.http_post('plugin.managesieve-action', {_act: 'addresses', _aid: id}, lock);
	};

	// update vacation addresses field with user identities
	rcube_webmail.prototype.managesieve_vacation_addresses_update = function(id, addresses)
	{
	var field = $('#vacation_addresses,#action_addresses' + (id \|\| ''));
	smart_field_reset(field.get(0), addresses);
	};

	function rule_header_select(id)
	{
	var obj = document.getElementById('header' + id),
	size = document.getElementById('rule_size' + id),
	msg = document.getElementById('rule_message' + id),
	op = document.getElementById('rule_op' + id),
	header = document.getElementById('custom_header' + id + '_list'),
	+ custstr = document.getElementById('custom_var' + id + '_list'),
	mod = document.getElementById('rule_mod' + id),
	trans = document.getElementById('rule_trans' + id),
	comp = document.getElementById('rule_comp' + id),
	datepart = document.getElementById('rule_date_part' + id),
	dateheader = document.getElementById('rule_date_header_div' + id),
	h = obj.value;

	if (h == 'size') {
	size.style.display = 'inline';
	- $.each([op, header, mod, trans, comp, msg], function() { this.style.display = 'none'; });
	+ $.each([op, header, custstr, mod, trans, comp, msg], function() { this.style.display = 'none'; });
	}
	else if (h == 'message') {
	msg.style.display = 'inline';
	- $.each([op, header, mod, trans, comp, size], function() { this.style.display = 'none'; });
	+ $.each([op, header, custstr, mod, trans, comp, size], function() { this.style.display = 'none'; });
	}
	else {
	header.style.display = h != '...' ? 'none' : 'inline-block';
	+ custstr.style.display = h != 'string' ? 'none' : 'inline-block';
	size.style.display = 'none';
	op.style.display = 'inline';
	comp.style.display = '';
	- mod.style.display = h == 'body' \|\| h == 'currentdate' \|\| h == 'date' ? 'none' : 'block';
	+ mod.style.display = h == 'body' \|\| h == 'currentdate' \|\| h == 'date' \|\| h == 'string' ? 'none' : 'block';
	trans.style.display = h == 'body' ? 'block' : 'none';
	msg.style.display = h == 'message' ? 'block' : 'none';
	}

	if (datepart)
	datepart.style.display = h == 'currentdate' \|\| h == 'date' ? 'inline' : 'none';
	if (dateheader)
	dateheader.style.display = h == 'date' ? '' : 'none';

	rule_op_select(op, id, h);
	rule_mod_select(id, h);
	- obj.style.width = h == '...' ? '40px' : '';
	+
	+ if (h == '...') obj.style.width = '40px';
	+ else if (h == 'string') obj.style.width = '90px';
	};

	function rule_op_select(obj, id, header)
	{
	var target = document.getElementById('rule_target' + id + '_list');

	if (!header)
	header = document.getElementById('header' + id).value;

	target.style.display = obj.value.match(/^(exists\|notexists)$/) \|\| header.match(/^(size\|message)$/) ? 'none' : 'inline-block';
	};

	function rule_trans_select(id)
	{
	var obj = document.getElementById('rule_trans_op' + id),
	target = document.getElementById('rule_trans_type' + id);

	target.style.display = obj.value != 'content' ? 'none' : 'inline';
	};

	function rule_mod_select(id, header)
	{
	var obj = document.getElementById('rule_mod_op' + id),
	target = document.getElementById('rule_mod_type' + id),
	duplicate = document.getElementById('rule_duplicate_div' + id),
	index = document.getElementById('rule_index_div' + id);

	if (!header)
	header = document.getElementById('header' + id).value;

	target.style.display = obj.value != 'address' && obj.value != 'envelope' ? 'none' : 'inline';

	if (index)
	- index.style.display = !header.match(/^(body\|currentdate\|size\|message)$/) && obj.value != 'envelope' ? '' : 'none';
	+ index.style.display = !header.match(/^(body\|currentdate\|size\|message\|string)$/) && obj.value != 'envelope' ? '' : 'none';

	if (duplicate)
	duplicate.style.display = header == 'message' ? '' : 'none';
	};

	function rule_join_radio(value)
	{
	$('#rules').css('display', value == 'any' ? 'none' : 'block');
	};

	function rule_adv_switch(id, elem)
	{
	var elem = $(elem), enabled = elem.hasClass('hide'), adv = $('#rule_advanced'+id);

	if (enabled) {
	adv.hide();
	elem.removeClass('hide').addClass('show');
	}
	else {
	adv.show();
	elem.removeClass('show').addClass('hide');
	}
	}

	function action_type_select(id)
	{
	var obj = document.getElementById('action_type' + id),
	v = obj.value, enabled = {},
	elems = {
	mailbox: document.getElementById('action_mailbox' + id),
	target: document.getElementById('redirect_target' + id),
	target_area: document.getElementById('action_target_area' + id),
	flags: document.getElementById('action_flags' + id),
	vacation: document.getElementById('action_vacation' + id),
	set: document.getElementById('action_set' + id),
	notify: document.getElementById('action_notify' + id)
	};

	if (v == 'fileinto' \|\| v == 'fileinto_copy') {
	enabled.mailbox = 1;
	}
	else if (v == 'redirect' \|\| v == 'redirect_copy') {
	enabled.target = 1;
	}
	else if (v.match(/^reject\|ereject$/)) {
	enabled.target_area = 1;
	}
	else if (v.match(/^(add\|set\|remove)flag$/)) {
	enabled.flags = 1;
	}
	else if (v == 'vacation') {
	enabled.vacation = 1;
	}
	else if (v == 'set') {
	enabled.set = 1;
	}
	else if (v == 'notify') {
	enabled.notify = 1;
	}

	for (var x in elems) {
	elems[x].style.display = !enabled[x] ? 'none' : 'inline';
	}
	};

	function vacation_action_select()
	{
	var selected = $('#vacation_action').val();

	$('#action_target_span')[selected == 'discard' \|\| selected == 'keep' ? 'hide' : 'show']();
	};

	// Inititalizes smart list input
	function smart_field_init(field)
	{
	var id = field.id + '_list',
	area = $('<span class="listarea"></span>'),
	list = field.value ? field.value.split("\n") : [''];

	if ($('#'+id).length)
	return;

	// add input rows
	$.each(list, function(i, v) {
	area.append(smart_field_row(v, field.name, i, $(field).data('size')));
	});

	area.attr('id', id);
	field = $(field);

	if (field.attr('disabled'))
	area.hide();
	// disable the original field anyway, we don't want it in POST
	else
	field.prop('disabled', true);

	field.after(area);

	if (field.hasClass('error')) {
	area.addClass('error');
	rcmail.managesieve_tip_register([[id, field.data('tip')]]);
	}
	};

	function smart_field_row(value, name, idx, size)
	{
	// build row element content
	var input, content = '<span class="listelement">'
	+ '<span class="reset"></span><input type="text"></span>',
	elem = $(content),
	attrs = {value: value, name: name + '[]'};

	if (size)
	attrs.size = size;

	input = $('input', elem).attr(attrs).keydown(function(e) {
	var input = $(this);

	// element creation event (on Enter)
	if (e.which == 13) {
	var name = input.attr('name').replace(/\[\]$/, ''),
	dt = (new Date()).getTime(),
	elem = smart_field_row('', name, dt, size);

	input.parent().after(elem);
	$('input', elem).focus();
	}
	// backspace or delete: remove input, focus previous one
	else if ((e.which == 8 \|\| e.which == 46) && input.val() == '') {

	var parent = input.parent(), siblings = parent.parent().children();

	if (siblings.length > 1) {
	if (parent.prev().length)
	parent.prev().children('input').focus();
	else
	parent.next().children('input').focus();

	parent.remove();
	return false;
	}
	}
	});

	// element deletion event
	$('span[class="reset"]', elem).click(function() {
	var span = $(this.parentNode);

	if (span.parent().children().length > 1)
	span.remove();
	else
	$('input', span).val('').focus();
	});

	return elem;
	}

	// Reset and fill the smart list input with new data
	function smart_field_reset(field, data)
	{
	var id = field.id + '_list',
	list = data.length ? data : [''];
	area = $('#' + id);

	area.empty();

	// add input rows
	$.each(list, function(i, v) {
	area.append(smart_field_row(v, field.name, i, $(field).data('size')));
	});
	}

	// Register onmouse(leave/enter) events for tips on specified form element
	rcube_webmail.prototype.managesieve_tip_register = function(tips)
	{
	var n, framed = parent.rcmail,
	tip = framed ? parent.rcmail.env.ms_tip_layer : rcmail.env.ms_tip_layer;

	for (n in tips) {
	$('#'+tips[n][0])
	.data('tip', tips[n][1])
	.mouseleave(function(e) { tip.hide(); })
	.mouseenter(function(e) {
	var elem = $(this),
	offset = elem.offset(),
	left = offset.left,
	top = offset.top - 12,
	minwidth = elem.width();

	if (framed) {
	offset = $((rcmail.env.task == 'mail' ? '#sievefilterform > iframe' : '#filter-box'), parent.document).offset();
	top += offset.top;
	left += offset.left;
	}

	tip.html(elem.data('tip'));
	top -= tip.height();

	tip.css({left: left, top: top, minWidth: (minwidth-2) + 'px'}).show();
	});
	}
	};

	// format time string
	function sieve_formattime(hour, minutes)
	{
	var i, c, h, time = '', format = rcmail.env.time_format \|\| 'H:i';

	for (i=0; i<format.length; i++) {
	c = format.charAt(i);
	switch (c) {
	case 'a': time += hour > 12 ? 'am' : 'pm'; break;
	case 'A': time += hour > 12 ? 'AM' : 'PM'; break;
	case 'g':
	case 'h':
	h = hour == 0 ? 12 : hour > 12 ? hour - 12 : hour;
	time += (c == 'h' && hour < 10 ? '0' : '') + hour;
	break;
	case 'G': time += hour; break;
	case 'H': time += (hour < 10 ? '0' : '') + hour; break;
	case 'i': time += (minutes < 10 ? '0' : '') + minutes; break;
	case 's': time += '00';
	default: time += c;
	}
	}

	return time;
	}

	function sieve_form_init()
	{
	// small resize for header element
	$('select[name="_header[]"]', rcmail.gui_objects.sieveform).each(function() {
	if (this.value == '...') this.style.width = '40px';
	+ if (this.value == 'string') this.style.width = '90px';
	});

	// resize dialog window
	if (rcmail.env.action == 'plugin.managesieve' && rcmail.env.task == 'mail') {
	parent.rcmail.managesieve_dialog_resize(rcmail.gui_objects.sieveform);
	}

	$('input[type="text"]:first', rcmail.gui_objects.sieveform).focus();

	// initialize smart list inputs
	$('textarea[data-type="list"]', rcmail.gui_objects.sieveform).each(function() {
	smart_field_init(this);
	});

	// enable date pickers on date fields
	if ($.datepicker && rcmail.env.date_format) {
	$.datepicker.setDefaults({
	dateFormat: rcmail.env.date_format,
	changeMonth: true,
	showOtherMonths: true,
	selectOtherMonths: true,
	onSelect: function(dateText) { $(this).focus().val(dateText); }
	});
	$('input.datepicker').datepicker();
	}

	// configure drop-down menu on time input fields based on jquery UI autocomplete
	$('#vacation_timefrom, #vacation_timeto')
	.attr('autocomplete', "off")
	.autocomplete({
	delay: 100,
	minLength: 1,
	source: function(p, callback) {
	var h, result = [];
	for (h = 0; h < 24; h++)
	result.push(sieve_formattime(h, 0));
	result.push(sieve_formattime(23, 59));

	return callback(result);
	},
	open: function(event, ui) {
	// scroll to current time
	var $this = $(this), val = $this.val(),
	widget = $this.autocomplete('widget').css('width', '10em'),
	menu = $this.data('ui-autocomplete').menu;

	if (val && val.length)
	widget.children().each(function() {
	var li = $(this);
	if (li.text().indexOf(val) == 0)
	menu._scrollIntoView(li);
	});
	},
	select: function(event, ui) {
	$(this).val(ui.item.value);
	return false;
	}
	})
	.click(function() { // show drop-down upon clicks
	$(this).autocomplete('search', $(this).val() \|\| ' ');
	})

	// display advanced controls when contain errors
	$('input.error').each(function() {
	if (String(this.id).match(/([0-9]+)$/)) {
	$('#ruleadv' + RegExp.$1 + '.show').click();
	}
	});
	}


	/*********************************************************/
	/******* Mail UI methods *******/
	/*********************************************************/

	rcube_webmail.prototype.managesieve_create = function(force)
	{
	if (!force && this.env.action != 'show') {
	var uid = this.message_list.get_single_selection(),
	lock = this.set_busy(true, 'loading');

	this.http_post('plugin.managesieve-action', {_uid: uid}, lock);
	return;
	}

	if (!this.env.sieve_headers \|\| !this.env.sieve_headers.length)
	return;

	var i, html, buttons = {}, dialog = $("#sievefilterform");

	// create dialog window
	if (!dialog.length) {
	dialog = $('<div id="sievefilterform"></div>');
	$('body').append(dialog);
	}

	// build dialog window content
	html = '<fieldset><legend>'+this.get_label('managesieve.usedata')+'</legend><ul>';
	for (i in this.env.sieve_headers)
	html += '<li><input type="checkbox" name="headers[]" id="sievehdr'+i+'" value="'+i+'" checked="checked" />'
	+'<label for="sievehdr'+i+'">'+this.env.sieve_headers[i][0]+':</label> '+this.env.sieve_headers[i][1]+'</li>';
	html += '</ul></fieldset>';

	dialog.html(html);

	// [Next Step] button action
	buttons[this.get_label('managesieve.nextstep')] = function () {
	// check if there's at least one checkbox checked
	var hdrs = $('input[name="headers[]"]:checked', dialog);
	if (!hdrs.length) {
	alert(rcmail.get_label('managesieve.nodata'));
	return;
	}

	// build frame URL
	var url = rcmail.get_task_url('mail');
	url = rcmail.add_url(url, '_action', 'plugin.managesieve');
	url = rcmail.add_url(url, '_framed', 1);

	hdrs.map(function() {
	var val = rcmail.env.sieve_headers[this.value];
	url = rcmail.add_url(url, 'r['+this.value+']', val[0]+':'+val[1]);
	});

	// load form in the iframe
	var frame = $('<iframe>').attr({src: url, frameborder: 0})
	dialog.empty().append(frame).dialog('widget').resize();

	// Change [Next Step] button with [Save] button
	buttons = {};
	buttons[rcmail.get_label('save')] = function() {
	var win = $('iframe', dialog).get(0).contentWindow;
	win.rcmail.managesieve_save();
	};
	dialog.dialog('option', 'buttons', buttons);
	};

	// show dialog window
	dialog.dialog({
	modal: false,
	resizable: true,
	closeOnEscape: !bw.ie7, // disable for performance reasons
	title: this.get_label('managesieve.newfilter'),
	close: function() { rcmail.managesieve_dialog_close(); },
	buttons: buttons,
	minWidth: 600,
	minHeight: 300,
	height: 250
	}).show();

	this.env.managesieve_dialog = dialog;
	}

	rcube_webmail.prototype.managesieve_dialog_close = function()
	{
	var dialog = this.env.managesieve_dialog;

	// BUG(?): if we don't remove the iframe first, it will be reloaded
	dialog.html('');
	dialog.dialog('destroy').hide();
	}

	rcube_webmail.prototype.managesieve_dialog_resize = function(o)
	{
	var dialog = this.env.managesieve_dialog,
	win = $(window), form = $(o);
	width = $('fieldset:first', o).width(), // fieldset width is more appropriate here
	height = form.height(),
	w = win.width(), h = win.height();

	dialog.dialog('option', { height: Math.min(h-20, height+120), width: Math.min(w-20, width+65) })
	.dialog('option', 'position', ['center', 'center']); // works in a separate call only (!?)
	}

File Metadata

Mime Type: text/x-diff
Expires: Mon, Apr 6, 1:13 AM (2 d, 4 h ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 18754752
Default Alt Text: (245 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions