No OneTemporary
Actions

Size

306 KB

Referenced Files

None

Subscribers

None

View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

	diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
	index 59406262e..a840bcd58 100644
	--- a/plugins/acl/acl.php
	+++ b/plugins/acl/acl.php
	@@ -1,730 +1,730 @@
	<?php

	/**
	* Folders Access Control Lists Management (RFC4314, RFC2086)
	*
	* @version @package_version@
	* @author Aleksander Machniak <alec@alec.pl>
	*
	*
	* Copyright (C) 2011-2012, 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 version 2
	- * as published by the Free Software Foundation.
	+ * 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, write to the Free Software Foundation, Inc.,
	- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	+ * 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 acl extends rcube_plugin
	{
	public $task = 'settings\|addressbook\|calendar';

	private $rc;
	private $supported = null;
	private $mbox;
	private $ldap;
	private $specials = array('anyone', 'anonymous');

	/**
	* Plugin initialization
	*/
	function init()
	{
	$this->rc = rcmail::get_instance();

	// Register hooks
	$this->add_hook('folder_form', array($this, 'folder_form'));
	// kolab_addressbook plugin
	$this->add_hook('addressbook_form', array($this, 'folder_form'));
	$this->add_hook('calendar_form_kolab', array($this, 'folder_form'));
	// Plugin actions
	$this->register_action('plugin.acl', array($this, 'acl_actions'));
	$this->register_action('plugin.acl-autocomplete', array($this, 'acl_autocomplete'));
	}

	/**
	* Handler for plugin actions (AJAX)
	*/
	function acl_actions()
	{
	$action = trim(rcube_utils::get_input_value('_act', rcube_utils::INPUT_GPC));

	// Connect to IMAP
	$this->rc->storage_init();

	// Load localization and configuration
	$this->add_texts('localization/');
	$this->load_config();

	if ($action == 'save') {
	$this->action_save();
	}
	else if ($action == 'delete') {
	$this->action_delete();
	}
	else if ($action == 'list') {
	$this->action_list();
	}

	// Only AJAX actions
	$this->rc->output->send();
	}

	/**
	* Handler for user login autocomplete request
	*/
	function acl_autocomplete()
	{
	$this->load_config();

	$search = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC, true);
	$sid = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
	$users = array();

	if ($this->init_ldap()) {
	$max = (int) $this->rc->config->get('autocomplete_max', 15);
	$mode = (int) $this->rc->config->get('addressbook_search_mode');

	$this->ldap->set_pagesize($max);
	$result = $this->ldap->search('*', $search, $mode);

	foreach ($result->records as $record) {
	$user = $record['uid'];

	if (is_array($user)) {
	$user = array_filter($user);
	$user = $user[0];
	}

	if ($user) {
	if ($record['name'])
	$user = $record['name'] . ' (' . $user . ')';

	$users[] = $user;
	}
	}
	}

	sort($users, SORT_LOCALE_STRING);

	$this->rc->output->command('ksearch_query_results', $users, $search, $sid);
	$this->rc->output->send();
	}

	/**
	* Handler for 'folder_form' hook
	*
	* @param array $args Hook arguments array (form data)
	*
	* @return array Hook arguments array
	*/
	function folder_form($args)
	{
	$mbox_imap = $args['options']['name'];
	$myrights = $args['options']['rights'];

	// Edited folder name (empty in create-folder mode)
	if (!strlen($mbox_imap)) {
	return $args;
	}
	/*
	// Do nothing on protected folders (?)
	if ($args['options']['protected']) {
	return $args;
	}
	*/
	// Get MYRIGHTS
	if (empty($myrights)) {
	return $args;
	}

	// Load localization and include scripts
	$this->load_config();
	$this->specials = $this->rc->config->get('acl_specials', $this->specials);
	$this->add_texts('localization/', array('deleteconfirm', 'norights',
	'nouser', 'deleting', 'saving'));
	$this->include_script('acl.js');
	$this->rc->output->include_script('list.js');
	$this->include_stylesheet($this->local_skin_path().'/acl.css');

	// add Info fieldset if it doesn't exist
	if (!isset($args['form']['props']['fieldsets']['info']))
	$args['form']['props']['fieldsets']['info'] = array(
	'name' => $this->rc->gettext('info'),
	'content' => array());

	// Display folder rights to 'Info' fieldset
	$args['form']['props']['fieldsets']['info']['content']['myrights'] = array(
	'label' => rcube::Q($this->gettext('myrights')),
	'value' => $this->acl2text($myrights)
	);

	// Return if not folder admin
	if (!in_array('a', $myrights)) {
	return $args;
	}

	// The 'Sharing' tab
	$this->mbox = $mbox_imap;
	$this->rc->output->set_env('acl_users_source', (bool) $this->rc->config->get('acl_users_source'));
	$this->rc->output->set_env('mailbox', $mbox_imap);
	$this->rc->output->add_handlers(array(
	'acltable' => array($this, 'templ_table'),
	'acluser' => array($this, 'templ_user'),
	'aclrights' => array($this, 'templ_rights'),
	));

	$this->rc->output->set_env('autocomplete_max', (int)$this->rc->config->get('autocomplete_max', 15));
	$this->rc->output->set_env('autocomplete_min_length', $this->rc->config->get('autocomplete_min_length'));
	$this->rc->output->add_label('autocompletechars', 'autocompletemore');

	$args['form']['sharing'] = array(
	'name' => rcube::Q($this->gettext('sharing')),
	'content' => $this->rc->output->parse('acl.table', false, false),
	);

	return $args;
	}

	/**
	* Creates ACL rights table
	*
	* @param array $attrib Template object attributes
	*
	* @return string HTML Content
	*/
	function templ_table($attrib)
	{
	if (empty($attrib['id']))
	$attrib['id'] = 'acl-table';

	$out = $this->list_rights($attrib);

	$this->rc->output->add_gui_object('acltable', $attrib['id']);

	return $out;
	}

	/**
	* Creates ACL rights form (rights list part)
	*
	* @param array $attrib Template object attributes
	*
	* @return string HTML Content
	*/
	function templ_rights($attrib)
	{
	// Get supported rights
	$supported = $this->rights_supported();

	// depending on server capability either use 'te' or 'd' for deleting msgs
	$deleteright = implode(array_intersect(str_split('ted'), $supported));

	$out = '';
	$ul = '';
	$input = new html_checkbox();

	// Advanced rights
	$attrib['id'] = 'advancedrights';
	foreach ($supported as $key => $val) {
	$id = "acl$val";
	$ul .= html::tag('li', null,
	$input->show('', array(
	'name' => "acl[$val]", 'value' => $val, 'id' => $id))
	. html::label(array('for' => $id, 'title' => $this->gettext('longacl'.$val)),
	$this->gettext('acl'.$val)));
	}

	$out = html::tag('ul', $attrib, $ul, html::$common_attrib);

	// Simple rights
	$ul = '';
	$attrib['id'] = 'simplerights';
	$items = array(
	'read' => 'lrs',
	'write' => 'wi',
	'delete' => $deleteright,
	'other' => preg_replace('/[lrswi'.$deleteright.']/', '', implode($supported)),
	);

	foreach ($items as $key => $val) {
	$id = "acl$key";
	$ul .= html::tag('li', null,
	$input->show('', array(
	'name' => "acl[$val]", 'value' => $val, 'id' => $id))
	. html::label(array('for' => $id, 'title' => $this->gettext('longacl'.$key)),
	$this->gettext('acl'.$key)));
	}

	$out .= "\n" . html::tag('ul', $attrib, $ul, html::$common_attrib);

	$this->rc->output->set_env('acl_items', $items);

	return $out;
	}

	/**
	* Creates ACL rights form (user part)
	*
	* @param array $attrib Template object attributes
	*
	* @return string HTML Content
	*/
	function templ_user($attrib)
	{
	// Create username input
	$attrib['name'] = 'acluser';

	$textfield = new html_inputfield($attrib);

	$fields['user'] = html::label(array('for' => 'iduser'), $this->gettext('username'))
	. ' ' . $textfield->show();

	// Add special entries
	if (!empty($this->specials)) {
	foreach ($this->specials as $key) {
	$fields[$key] = html::label(array('for' => 'id'.$key), $this->gettext($key));
	}
	}

	$this->rc->output->set_env('acl_specials', $this->specials);

	// Create list with radio buttons
	if (count($fields) > 1) {
	$ul = '';
	$radio = new html_radiobutton(array('name' => 'usertype'));
	foreach ($fields as $key => $val) {
	$ul .= html::tag('li', null, $radio->show($key == 'user' ? 'user' : '',
	array('value' => $key, 'id' => 'id'.$key))
	. $val);
	}

	$out = html::tag('ul', array('id' => 'usertype'), $ul, html::$common_attrib);
	}
	// Display text input alone
	else {
	$out = $fields['user'];
	}

	return $out;
	}

	/**
	* Creates ACL rights table
	*
	* @param array $attrib Template object attributes
	*
	* @return string HTML Content
	*/
	private function list_rights($attrib=array())
	{
	// Get ACL for the folder
	$acl = $this->rc->storage->get_acl($this->mbox);

	if (!is_array($acl)) {
	$acl = array();
	}

	// Keep special entries (anyone/anonymous) on top of the list
	if (!empty($this->specials) && !empty($acl)) {
	foreach ($this->specials as $key) {
	if (isset($acl[$key])) {
	$acl_special[$key] = $acl[$key];
	unset($acl[$key]);
	}
	}
	}

	// Sort the list by username
	uksort($acl, 'strnatcasecmp');

	if (!empty($acl_special)) {
	$acl = array_merge($acl_special, $acl);
	}

	// Get supported rights and build column names
	$supported = $this->rights_supported();

	// depending on server capability either use 'te' or 'd' for deleting msgs
	$deleteright = implode(array_intersect(str_split('ted'), $supported));

	// Use advanced or simple (grouped) rights
	$advanced = $this->rc->config->get('acl_advanced_mode');

	if ($advanced) {
	$items = array();
	foreach ($supported as $sup) {
	$items[$sup] = $sup;
	}
	}
	else {
	$items = array(
	'read' => 'lrs',
	'write' => 'wi',
	'delete' => $deleteright,
	'other' => preg_replace('/[lrswi'.$deleteright.']/', '', implode($supported)),
	);
	}

	// Create the table
	$attrib['noheader'] = true;
	$table = new html_table($attrib);

	// Create table header
	$table->add_header('user', $this->gettext('identifier'));
	foreach (array_keys($items) as $key) {
	$label = $this->gettext('shortacl'.$key);
	$table->add_header(array('class' => 'acl'.$key, 'title' => $label), $label);
	}

	$js_table = array();
	foreach ($acl as $user => $rights) {
	if ($this->rc->storage->conn->user == $user) {
	continue;
	}

	// filter out virtual rights (c or d) the server may return
	$userrights = array_intersect($rights, $supported);
	$userid = rcube_utils::html_identifier($user);

	if (!empty($this->specials) && in_array($user, $this->specials)) {
	$user = $this->gettext($user);
	}

	$table->add_row(array('id' => 'rcmrow'.$userid));
	$table->add('user', rcube::Q($user));

	foreach ($items as $key => $right) {
	$in = $this->acl_compare($userrights, $right);
	switch ($in) {
	case 2: $class = 'enabled'; break;
	case 1: $class = 'partial'; break;
	default: $class = 'disabled'; break;
	}
	$table->add('acl' . $key . ' ' . $class, '');
	}

	$js_table[$userid] = implode($userrights);
	}

	$this->rc->output->set_env('acl', $js_table);
	$this->rc->output->set_env('acl_advanced', $advanced);

	$out = $table->show();

	return $out;
	}

	/**
	* Handler for ACL update/create action
	*/
	private function action_save()
	{
	$mbox = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC, true)); // UTF7-IMAP
	$user = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_GPC));
	$acl = trim(rcube_utils::get_input_value('_acl', rcube_utils::INPUT_GPC));
	$oldid = trim(rcube_utils::get_input_value('_old', rcube_utils::INPUT_GPC));

	$acl = array_intersect(str_split($acl), $this->rights_supported());
	$users = $oldid ? array($user) : explode(',', $user);
	$result = 0;

	foreach ($users as $user) {
	$user = trim($user);

	if (!empty($this->specials) && in_array($user, $this->specials)) {
	$username = $this->gettext($user);
	}
	else if (!empty($user)) {
	if (!strpos($user, '@') && ($realm = $this->get_realm())) {
	$user .= '@' . rcube_utils::idn_to_ascii(preg_replace('/^@/', '', $realm));
	}
	$username = $user;
	}

	if (!$acl \|\| !$user \|\| !strlen($mbox)) {
	continue;
	}

	$user = $this->mod_login($user);
	$username = $this->mod_login($username);

	if ($user != $_SESSION['username'] && $username != $_SESSION['username']) {
	if ($this->rc->storage->set_acl($mbox, $user, $acl)) {
	$ret = array('id' => rcube_utils::html_identifier($user),
	'username' => $username, 'acl' => implode($acl), 'old' => $oldid);
	$this->rc->output->command('acl_update', $ret);
	$result++;
	}
	}
	}

	if ($result) {
	$this->rc->output->show_message($oldid ? 'acl.updatesuccess' : 'acl.createsuccess', 'confirmation');
	}
	else {
	$this->rc->output->show_message($oldid ? 'acl.updateerror' : 'acl.createerror', 'error');
	}
	}

	/**
	* Handler for ACL delete action
	*/
	private function action_delete()
	{
	$mbox = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC, true)); //UTF7-IMAP
	$user = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_GPC));

	$user = explode(',', $user);

	foreach ($user as $u) {
	$u = trim($u);
	if ($this->rc->storage->delete_acl($mbox, $u)) {
	$this->rc->output->command('acl_remove_row', rcube_utils::html_identifier($u));
	}
	else {
	$error = true;
	}
	}

	if (!$error) {
	$this->rc->output->show_message('acl.deletesuccess', 'confirmation');
	}
	else {
	$this->rc->output->show_message('acl.deleteerror', 'error');
	}
	}

	/**
	* Handler for ACL list update action (with display mode change)
	*/
	private function action_list()
	{
	if (in_array('acl_advanced_mode', (array)$this->rc->config->get('dont_override'))) {
	return;
	}

	$this->mbox = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC, true)); // UTF7-IMAP
	$advanced = trim(rcube_utils::get_input_value('_mode', rcube_utils::INPUT_GPC));
	$advanced = $advanced == 'advanced' ? true : false;

	// Save state in user preferences
	$this->rc->user->save_prefs(array('acl_advanced_mode' => $advanced));

	$out = $this->list_rights();

	$out = preg_replace(array('/^<table[^>]+>/', '/<\/table>$/'), '', $out);

	$this->rc->output->command('acl_list_update', $out);
	}

	/**
	* Creates <UL> list with descriptive access rights
	*
	* @param array $rights MYRIGHTS result
	*
	* @return string HTML content
	*/
	function acl2text($rights)
	{
	if (empty($rights)) {
	return '';
	}

	$supported = $this->rights_supported();
	$list = array();
	$attrib = array(
	'name' => 'rcmyrights',
	'style' => 'margin:0; padding:0 15px;',
	);

	foreach ($supported as $right) {
	if (in_array($right, $rights)) {
	$list[] = html::tag('li', null, rcube::Q($this->gettext('acl' . $right)));
	}
	}

	if (count($list) == count($supported))
	return rcube::Q($this->gettext('aclfull'));

	return html::tag('ul', $attrib, implode("\n", $list));
	}

	/**
	* Compares two ACLs (according to supported rights)
	*
	* @param array $acl1 ACL rights array (or string)
	* @param array $acl2 ACL rights array (or string)
	*
	* @param int Comparision result, 2 - full match, 1 - partial match, 0 - no match
	*/
	function acl_compare($acl1, $acl2)
	{
	if (!is_array($acl1)) $acl1 = str_split($acl1);
	if (!is_array($acl2)) $acl2 = str_split($acl2);

	$rights = $this->rights_supported();

	$acl1 = array_intersect($acl1, $rights);
	$acl2 = array_intersect($acl2, $rights);
	$res = array_intersect($acl1, $acl2);

	$cnt1 = count($res);
	$cnt2 = count($acl2);

	if ($cnt1 == $cnt2)
	return 2;
	else if ($cnt1)
	return 1;
	else
	return 0;
	}

	/**
	* Get list of supported access rights (according to RIGHTS capability)
	*
	* @return array List of supported access rights abbreviations
	*/
	function rights_supported()
	{
	if ($this->supported !== null) {
	return $this->supported;
	}

	$capa = $this->rc->storage->get_capability('RIGHTS');

	if (is_array($capa)) {
	$rights = strtolower($capa[0]);
	}
	else {
	$rights = 'cd';
	}

	return $this->supported = str_split('lrswi' . $rights . 'pa');
	}

	/**
	* Username realm detection.
	*
	* @return string Username realm (domain)
	*/
	private function get_realm()
	{
	// When user enters a username without domain part, realm
	// allows to add it to the username (and display correct username in the table)

	if (isset($_SESSION['acl_username_realm'])) {
	return $_SESSION['acl_username_realm'];
	}

	// find realm in username of logged user (?)
	list($name, $domain) = explode('@', $_SESSION['username']);

	// Use (always existent) ACL entry on the INBOX for the user to determine
	// whether or not the user ID in ACL entries need to be qualified and how
	// they would need to be qualified.
	if (empty($domain)) {
	$acl = $this->rc->storage->get_acl('INBOX');
	if (is_array($acl)) {
	$regexp = '/^' . preg_quote($_SESSION['username'], '/') . '@(.*)$/';
	foreach (array_keys($acl) as $name) {
	if (preg_match($regexp, $name, $matches)) {
	$domain = $matches[1];
	break;
	}
	}
	}
	}

	return $_SESSION['acl_username_realm'] = $domain;
	}

	/**
	* Initializes autocomplete LDAP backend
	*/
	private function init_ldap()
	{
	if ($this->ldap)
	return $this->ldap->ready;

	// get LDAP config
	$config = $this->rc->config->get('acl_users_source');

	if (empty($config)) {
	return false;
	}

	// not an array, use configured ldap_public source
	if (!is_array($config)) {
	$ldap_config = (array) $this->rc->config->get('ldap_public');
	$config = $ldap_config[$config];
	}

	$uid_field = $this->rc->config->get('acl_users_field', 'mail');
	$filter = $this->rc->config->get('acl_users_filter');

	if (empty($uid_field) \|\| empty($config)) {
	return false;
	}

	// get name attribute
	if (!empty($config['fieldmap'])) {
	$name_field = $config['fieldmap']['name'];
	}
	// ... no fieldmap, use the old method
	if (empty($name_field)) {
	$name_field = $config['name_field'];
	}

	// add UID field to fieldmap, so it will be returned in a record with name
	$config['fieldmap'] = array(
	'name' => $name_field,
	'uid' => $uid_field,
	);

	// search in UID and name fields
	$config['search_fields'] = array_values($config['fieldmap']);
	$config['required_fields'] = array($uid_field);

	// set search filter
	if ($filter)
	$config['filter'] = $filter;

	// disable vlv
	$config['vlv'] = false;

	// Initialize LDAP connection
	$this->ldap = new rcube_ldap($config,
	$this->rc->config->get('ldap_debug'),
	$this->rc->config->mail_domain($_SESSION['imap_host']));

	return $this->ldap->ready;
	}

	/**
	* Modify user login according to 'login_lc' setting
	*/
	protected function mod_login($user)
	{
	$login_lc = $this->rc->config->get('login_lc');

	if ($login_lc === true \|\| $login_lc == 2) {
	$user = mb_strtolower($user);
	}
	// lowercase domain name
	else if ($login_lc && strpos($user, '@')) {
	list($local, $domain) = explode('@', $user);
	$user = $local . '@' . mb_strtolower($domain);
	}

	return $user;
	}
	}
	diff --git a/plugins/acl/package.xml b/plugins/acl/package.xml
	index 52e234f37..98460e82f 100644
	--- a/plugins/acl/package.xml
	+++ b/plugins/acl/package.xml
	@@ -1,63 +1,63 @@
	<?xml version="1.0" encoding="UTF-8"?>
	<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
	http://pear.php.net/dtd/tasks-1.0.xsd
	http://pear.php.net/dtd/package-2.0
	http://pear.php.net/dtd/package-2.0.xsd">
	<name>acl</name>
	<channel>pear.roundcube.net</channel>
	<summary>Folders Access Control Lists</summary>
	<description>IMAP Folders Access Control Lists Management (RFC4314, RFC2086).</description>
	<lead>
	<name>Aleksander Machniak</name>
	<user>alec</user>
	<email>alec@alec.pl</email>
	<active>yes</active>
	</lead>
	<date>2013-03-01</date>
	<version>
	<release>1.2</release>
	<api>0.7</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	- <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	+ <license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
	<notes>-</notes>
	<contents>
	<dir baseinstalldir="/" name="/">
	<file name="acl.php" role="php">
	<tasks:replace from="@name@" to="name" type="package-info"/>
	<tasks:replace from="@package_version@" to="version" type="package-info"/>
	</file>
	<file name="acl.js" role="data">
	<tasks:replace from="@name@" to="name" type="package-info"/>
	<tasks:replace from="@package_version@" to="version" type="package-info"/>
	</file>
	<file name="config.inc.php.dist" role="data"></file>
	<file name="localization/de_DE.inc" role="data"></file>
	<file name="localization/en_US.inc" role="data"></file>
	<file name="localization/pl_PL.inc" role="data"></file>
	<file name="skins/classic/acl.css" role="data"></file>
	<file name="skins/classic/images/enabled.png" role="data"></file>
	<file name="skins/classic/images/partial.png" role="data"></file>
	<file name="skins/classic/templates/table.html" role="data"></file>
	<file name="skins/larry/acl.css" role="data"></file>
	<file name="skins/larry/images/enabled.png" role="data"></file>
	<file name="skins/larry/images/partial.png" role="data"></file>
	<file name="skins/larry/templates/table.html" role="data"></file>
	</dir>
	<!-- / -->
	</contents>
	<dependencies>
	<required>
	<php>
	<min>5.2.1</min>
	</php>
	<pearinstaller>
	<min>1.7.0</min>
	</pearinstaller>
	</required>
	</dependencies>
	<phprelease/>
	</package>
	diff --git a/plugins/attachment_reminder/attachment_reminder.php b/plugins/attachment_reminder/attachment_reminder.php
	index 82ad7a60e..84cc5f3b3 100755
	--- a/plugins/attachment_reminder/attachment_reminder.php
	+++ b/plugins/attachment_reminder/attachment_reminder.php
	@@ -1,84 +1,84 @@
	<?php
	/**
	* Attachement Reminder
	*
	* A plugin that reminds a user to attach the files
	*
	* @version @package_version@
	* @author Thomas Yu - Sian, Liu
	* @author Aleksander Machniak <machniak@kolabsys.com>
	*
	* Copyright (C) 2013 Thomas Yu - Sian, Liu
	* Copyright (C) 2013, 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/>
	+ * along with this program. If not, see <http://www.gnu.org/licenses/>
	*/

	class attachment_reminder extends rcube_plugin
	{
	public $task = 'mail\|settings';
	public $noajax = true;


	function init()
	{
	$rcmail = rcube::get_instance();

	if ($rcmail->task == 'mail' && $rcmail->action == 'compose') {
	if ($rcmail->config->get('attachment_reminder')) {
	$this->include_script('attachment_reminder.js');
	$this->add_texts('localization/', array('keywords', 'forgotattachment'));
	$rcmail->output->add_label('addattachment', 'send');
	}
	}

	if ($rcmail->task == 'settings') {
	$dont_override = $rcmail->config->get('dont_override', array());

	if (!in_array('attachment_reminder', $dont_override)) {
	$this->add_hook('preferences_list', array($this, 'prefs_list'));
	$this->add_hook('preferences_save', array($this, 'prefs_save'));
	}
	}
	}

	function prefs_list($args)
	{
	if ($args['section'] == 'compose') {
	$this->add_texts('localization/');
	$reminder = rcube::get_instance()->config->get('attachment_reminder');
	$field_id = 'rcmfd_attachment_reminder';
	$checkbox = new html_checkbox(array('name' => '_attachment_reminder', 'id' => $field_id, 'value' => 1));

	$args['blocks']['main']['options']['attachment_reminder'] = array(
	'title' => html::label($field_id, rcube::Q($this->gettext('reminderoption'))),
	'content' => $checkbox->show($reminder ? 1 : 0),
	);
	}

	return $args;
	}

	function prefs_save($args)
	{
	if ($args['section'] == 'compose') {
	$dont_override = rcube::get_instance()->config->get('dont_override', array());
	if (!in_array('attachment_reminder', $dont_override)) {
	$args['prefs']['attachment_reminder'] = !empty($_POST['_attachment_reminder']);
	}
	}
	return $args;
	}

	}
	diff --git a/plugins/example_addressbook/example_addressbook.php b/plugins/example_addressbook/example_addressbook.php
	index a15461f44..31077adf7 100644
	--- a/plugins/example_addressbook/example_addressbook.php
	+++ b/plugins/example_addressbook/example_addressbook.php
	@@ -1,50 +1,53 @@
	<?php

	require_once(dirname(__FILE__) . '/example_addressbook_backend.php');

	/**
	* Sample plugin to add a new address book
	* with just a static list of contacts
	+ *
	+ * @license GNU GPLv3+
	+ * @author Thomas Bruederli
	*/
	class example_addressbook extends rcube_plugin
	{
	private $abook_id = 'static';
	private $abook_name = 'Static List';

	public function init()
	{
	$this->add_hook('addressbooks_list', array($this, 'address_sources'));
	$this->add_hook('addressbook_get', array($this, 'get_address_book'));

	// use this address book for autocompletion queries
	// (maybe this should be configurable by the user?)
	$config = rcmail::get_instance()->config;
	$sources = (array) $config->get('autocomplete_addressbooks', array('sql'));
	if (!in_array($this->abook_id, $sources)) {
	$sources[] = $this->abook_id;
	$config->set('autocomplete_addressbooks', $sources);
	}
	}

	public function address_sources($p)
	{
	$abook = new example_addressbook_backend($this->abook_name);
	$p['sources'][$this->abook_id] = array(
	'id' => $this->abook_id,
	'name' => $this->abook_name,
	'readonly' => $abook->readonly,
	'groups' => $abook->groups,
	);
	return $p;
	}

	public function get_address_book($p)
	{
	if ($p['id'] === $this->abook_id) {
	$p['instance'] = new example_addressbook_backend($this->abook_name);
	}

	return $p;
	}

	}
	diff --git a/plugins/filesystem_attachments/filesystem_attachments.php b/plugins/filesystem_attachments/filesystem_attachments.php
	index d952e5a75..8d995ca0d 100644
	--- a/plugins/filesystem_attachments/filesystem_attachments.php
	+++ b/plugins/filesystem_attachments/filesystem_attachments.php
	@@ -1,162 +1,163 @@
	<?php
	/**
	* Filesystem Attachments
	*
	* This is a core plugin which provides basic, filesystem based
	* attachment temporary file handling. This includes storing
	* attachments of messages currently being composed, writing attachments
	* to disk when drafts with attachments are re-opened and writing
	* attachments to disk for inline display in current html compositions.
	*
	* Developers may wish to extend this class when creating attachment
	* handler plugins:
	* require_once('plugins/filesystem_attachments/filesystem_attachments.php');
	* class myCustom_attachments extends filesystem_attachments
	*
	+ * @license GNU GPLv3+
	* @author Ziba Scott <ziba@umich.edu>
	* @author Thomas Bruederli <roundcube@gmail.com>
	*
	*/
	class filesystem_attachments extends rcube_plugin
	{
	public $task = '?(?!login).*';

	function init()
	{
	// Save a newly uploaded attachment
	$this->add_hook('attachment_upload', array($this, 'upload'));

	// Save an attachment from a non-upload source (draft or forward)
	$this->add_hook('attachment_save', array($this, 'save'));

	// Remove an attachment from storage
	$this->add_hook('attachment_delete', array($this, 'remove'));

	// When composing an html message, image attachments may be shown
	$this->add_hook('attachment_display', array($this, 'display'));

	// Get the attachment from storage and place it on disk to be sent
	$this->add_hook('attachment_get', array($this, 'get'));

	// Delete all temp files associated with this user
	$this->add_hook('attachments_cleanup', array($this, 'cleanup'));
	$this->add_hook('session_destroy', array($this, 'cleanup'));
	}

	/**
	* Save a newly uploaded attachment
	*/
	function upload($args)
	{
	$args['status'] = false;
	$group = $args['group'];
	$rcmail = rcmail::get_instance();

	// use common temp dir for file uploads
	$temp_dir = $rcmail->config->get('temp_dir');
	$tmpfname = tempnam($temp_dir, 'rcmAttmnt');

	if (move_uploaded_file($args['path'], $tmpfname) && file_exists($tmpfname)) {
	$args['id'] = $this->file_id();
	$args['path'] = $tmpfname;
	$args['status'] = true;
	@chmod($tmpfname, 0600); // set correct permissions (#1488996)

	// Note the file for later cleanup
	$_SESSION['plugins']['filesystem_attachments'][$group][] = $tmpfname;
	}

	return $args;
	}

	/**
	* Save an attachment from a non-upload source (draft or forward)
	*/
	function save($args)
	{
	$group = $args['group'];
	$args['status'] = false;

	if (!$args['path']) {
	$rcmail = rcmail::get_instance();
	$temp_dir = $rcmail->config->get('temp_dir');
	$tmp_path = tempnam($temp_dir, 'rcmAttmnt');

	if ($fp = fopen($tmp_path, 'w')) {
	fwrite($fp, $args['data']);
	fclose($fp);
	$args['path'] = $tmp_path;
	} else
	return $args;
	}

	$args['id'] = $this->file_id();
	$args['status'] = true;

	// Note the file for later cleanup
	$_SESSION['plugins']['filesystem_attachments'][$group][] = $args['path'];

	return $args;
	}

	/**
	* Remove an attachment from storage
	* This is triggered by the remove attachment button on the compose screen
	*/
	function remove($args)
	{
	$args['status'] = @unlink($args['path']);
	return $args;
	}

	/**
	* When composing an html message, image attachments may be shown
	* For this plugin, the file is already in place, just check for
	* the existance of the proper metadata
	*/
	function display($args)
	{
	$args['status'] = file_exists($args['path']);
	return $args;
	}

	/**
	* This attachment plugin doesn't require any steps to put the file
	* on disk for use. This stub function is kept here to make this
	* class handy as a parent class for other plugins which may need it.
	*/
	function get($args)
	{
	return $args;
	}

	/**
	* Delete all temp files associated with this user
	*/
	function cleanup($args)
	{
	// $_SESSION['compose']['attachments'] is not a complete record of
	// temporary files because loading a draft or starting a forward copies
	// the file to disk, but does not make an entry in that array
	if (is_array($_SESSION['plugins']['filesystem_attachments'])){
	foreach ($_SESSION['plugins']['filesystem_attachments'] as $group => $files) {
	if ($args['group'] && $args['group'] != $group)
	continue;
	foreach ((array)$files as $filename){
	if(file_exists($filename)){
	unlink($filename);
	}
	}
	unset($_SESSION['plugins']['filesystem_attachments'][$group]);
	}
	}
	return $args;
	}

	function file_id()
	{
	$userid = rcmail::get_instance()->user->ID;
	list($usec, $sec) = explode(' ', microtime());
	return preg_replace('/[^0-9]/', '', $userid . $sec . $usec);
	}
	}
	diff --git a/plugins/filesystem_attachments/package.xml b/plugins/filesystem_attachments/package.xml
	index 031a74297..49ec51934 100644
	--- a/plugins/filesystem_attachments/package.xml
	+++ b/plugins/filesystem_attachments/package.xml
	@@ -1,59 +1,59 @@
	<?xml version="1.0" encoding="UTF-8"?>
	<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
	http://pear.php.net/dtd/tasks-1.0.xsd
	http://pear.php.net/dtd/package-2.0
	http://pear.php.net/dtd/package-2.0.xsd">
	<name>filesystem_attachments</name>
	<channel>pear.roundcube.net</channel>
	<summary>Default database storage for uploaded attachments</summary>
	<description>
	This is a core plugin which provides basic, filesystem based
	attachment temporary file handling. This includes storing
	attachments of messages currently being composed, writing attachments
	to disk when drafts with attachments are re-opened and writing
	attachments to disk for inline display in current html compositions.
	</description>
	<lead>
	<name>Thomas Bruederli</name>
	<user>thomasb</user>
	<email>roundcube@gmail.com</email>
	<active>yes</active>
	</lead>
	<developer>
	<name>Ziba Scott</name>
	<user>ziba</user>
	<email>ziba@umich.edu</email>
	<active>yes</active>
	</developer>
	<date>2011-11-21</date>
	<version>
	<release>1.0</release>
	<api>1.0</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	- <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	+ <license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
	<notes>-</notes>
	<contents>
	<dir baseinstalldir="/" name="/">
	<file name="filesystem_attachments.php" role="php">
	<tasks:replace from="@name@" to="name" type="package-info"/>
	<tasks:replace from="@package_version@" to="version" type="package-info"/>
	</file>
	</dir>
	<!-- / -->
	</contents>
	<dependencies>
	<required>
	<php>
	<min>5.2.1</min>
	</php>
	<pearinstaller>
	<min>1.7.0</min>
	</pearinstaller>
	</required>
	</dependencies>
	<phprelease/>
	</package>
	diff --git a/plugins/help/content/license.html b/plugins/help/content/license.html
	index 371dbffe1..9034d46f8 100644
	--- a/plugins/help/content/license.html
	+++ b/plugins/help/content/license.html
	@@ -1,689 +1,689 @@
	<div id="helplicense" class="readtext">
	<h2 style="text-align: center;">GNU GENERAL PUBLIC LICENSE</h2>
	<p style="text-align: center;">Version 3, 29 June 2007</p>

	<p>Copyright © 2007 Free Software Foundation, Inc.
	<<a href="http://fsf.org/">http://fsf.org/</a>></p><p>
	Everyone is permitted to copy and distribute verbatim copies
	of this license document, but changing it is not allowed.</p>

	<h3>Preamble</h3>

	<p>The GNU General Public License is a free, copyleft license for
	software and other kinds of works.</p>

	<p>The licenses for most software and other practical works are designed
	to take away your freedom to share and change the works. By contrast,
	the GNU General Public License is intended to guarantee your freedom to
	share and change all versions of a program--to make sure it remains free
	software for all its users. We, the Free Software Foundation, use the
	GNU General Public License for most of our software; it applies also to
	any other work released this way by its authors. You can apply it to
	your programs, too.</p>

	<p>When we speak of free software, we are referring to freedom, not
	price. Our General Public Licenses are designed to make sure that you
	have the freedom to distribute copies of free software (and charge for
	them if you wish), that you receive source code or can get it if you
	want it, that you can change the software or use pieces of it in new
	free programs, and that you know you can do these things.</p>

	<p>To protect your rights, we need to prevent others from denying you
	these rights or asking you to surrender the rights. Therefore, you have
	certain responsibilities if you distribute copies of the software, or if
	you modify it: responsibilities to respect the freedom of others.</p>

	<p>For example, if you distribute copies of such a program, whether
	gratis or for a fee, you must pass on to the recipients the same
	freedoms that you received. You must make sure that they, too, receive
	or can get the source code. And you must show them these terms so they
	know their rights.</p>

	<p>Developers that use the GNU GPL protect your rights with two steps:
	(1) assert copyright on the software, and (2) offer you this License
	giving you legal permission to copy, distribute and/or modify it.</p>

	<p>For the developers' and authors' protection, the GPL clearly explains
	that there is no warranty for this free software. For both users' and
	authors' sake, the GPL requires that modified versions be marked as
	changed, so that their problems will not be attributed erroneously to
	authors of previous versions.</p>

	<p>Some devices are designed to deny users access to install or run
	modified versions of the software inside them, although the manufacturer
	can do so. This is fundamentally incompatible with the aim of
	protecting users' freedom to change the software. The systematic
	pattern of such abuse occurs in the area of products for individuals to
	use, which is precisely where it is most unacceptable. Therefore, we
	have designed this version of the GPL to prohibit the practice for those
	products. If such problems arise substantially in other domains, we
	stand ready to extend this provision to those domains in future versions
	of the GPL, as needed to protect the freedom of users.</p>

	<p>Finally, every program is threatened constantly by software patents.
	States should not allow patents to restrict development and use of
	software on general-purpose computers, but in those that do, we wish to
	avoid the special danger that patents applied to a free program could
	make it effectively proprietary. To prevent this, the GPL assures that
	patents cannot be used to render the program non-free.</p>

	<p>The precise terms and conditions for copying, distribution and
	modification follow.</p>

	<h3><a name="terms"></a>TERMS AND CONDITIONS</h3>

	<h4><a name="section0"></a>0. Definitions.</h4>

	<p>“This License” refers to version 3 of the GNU General Public License.</p>

	<p>“Copyright” also means copyright-like laws that apply to other kinds of
	works, such as semiconductor masks.</p>

	<p>“The Program” refers to any copyrightable work licensed under this
	License. Each licensee is addressed as “you”. “Licensees” and
	“recipients” may be individuals or organizations.</p>

	<p>To “modify” a work means to copy from or adapt all or part of the work
	in a fashion requiring copyright permission, other than the making of an
	exact copy. The resulting work is called a “modified version” of the
	earlier work or a work “based on” the earlier work.</p>

	<p>A “covered work” means either the unmodified Program or a work based
	on the Program.</p>

	<p>To “propagate” a work means to do anything with it that, without
	permission, would make you directly or secondarily liable for
	infringement under applicable copyright law, except executing it on a
	computer or modifying a private copy. Propagation includes copying,
	distribution (with or without modification), making available to the
	public, and in some countries other activities as well.</p>

	<p>To “convey” a work means any kind of propagation that enables other
	parties to make or receive copies. Mere interaction with a user through
	a computer network, with no transfer of a copy, is not conveying.</p>

	<p>An interactive user interface displays “Appropriate Legal Notices”
	to the extent that it includes a convenient and prominently visible
	feature that (1) displays an appropriate copyright notice, and (2)
	tells the user that there is no warranty for the work (except to the
	extent that warranties are provided), that licensees may convey the
	work under this License, and how to view a copy of this License. If
	the interface presents a list of user commands or options, such as a
	menu, a prominent item in the list meets this criterion.</p>

	<h4><a name="section1"></a>1. Source Code.</h4>

	<p>The “source code” for a work means the preferred form of the work
	for making modifications to it. “Object code” means any non-source
	form of a work.</p>

	<p>A “Standard Interface” means an interface that either is an official
	standard defined by a recognized standards body, or, in the case of
	interfaces specified for a particular programming language, one that
	is widely used among developers working in that language.</p>

	<p>The “System Libraries” of an executable work include anything, other
	than the work as a whole, that (a) is included in the normal form of
	packaging a Major Component, but which is not part of that Major
	Component, and (b) serves only to enable use of the work with that
	Major Component, or to implement a Standard Interface for which an
	implementation is available to the public in source code form. A
	“Major Component”, in this context, means a major essential component
	(kernel, window system, and so on) of the specific operating system
	(if any) on which the executable work runs, or a compiler used to
	produce the work, or an object code interpreter used to run it.</p>

	<p>The “Corresponding Source” for a work in object code form means all
	the source code needed to generate, install, and (for an executable
	work) run the object code and to modify the work, including scripts to
	control those activities. However, it does not include the work's
	System Libraries, or general-purpose tools or generally available free
	programs which are used unmodified in performing those activities but
	which are not part of the work. For example, Corresponding Source
	includes interface definition files associated with source files for
	the work, and the source code for shared libraries and dynamically
	linked subprograms that the work is specifically designed to require,
	such as by intimate data communication or control flow between those
	subprograms and other parts of the work.</p>

	<p>The Corresponding Source need not include anything that users
	can regenerate automatically from other parts of the Corresponding
	Source.</p>

	<p>The Corresponding Source for a work in source code form is that
	same work.</p>

	<h4><a name="section2"></a>2. Basic Permissions.</h4>

	<p>All rights granted under this License are granted for the term of
	copyright on the Program, and are irrevocable provided the stated
	conditions are met. This License explicitly affirms your unlimited
	permission to run the unmodified Program. The output from running a
	covered work is covered by this License only if the output, given its
	content, constitutes a covered work. This License acknowledges your
	rights of fair use or other equivalent, as provided by copyright law.</p>

	<p>You may make, run and propagate covered works that you do not
	convey, without conditions so long as your license otherwise remains
	in force. You may convey covered works to others for the sole purpose
	of having them make modifications exclusively for you, or provide you
	with facilities for running those works, provided that you comply with
	the terms of this License in conveying all material for which you do
	not control copyright. Those thus making or running the covered works
	for you must do so exclusively on your behalf, under your direction
	and control, on terms that prohibit them from making any copies of
	your copyrighted material outside their relationship with you.</p>

	<p>Conveying under any other circumstances is permitted solely under
	the conditions stated below. Sublicensing is not allowed; section 10
	makes it unnecessary.</p>

	<h4><a name="section3"></a>3. Protecting Users' Legal Rights From Anti-Circumvention Law.</h4>

	<p>No covered work shall be deemed part of an effective technological
	measure under any applicable law fulfilling obligations under article
	11 of the WIPO copyright treaty adopted on 20 December 1996, or
	similar laws prohibiting or restricting circumvention of such
	measures.</p>

	<p>When you convey a covered work, you waive any legal power to forbid
	circumvention of technological measures to the extent such circumvention
	is effected by exercising rights under this License with respect to
	the covered work, and you disclaim any intention to limit operation or
	modification of the work as a means of enforcing, against the work's
	users, your or third parties' legal rights to forbid circumvention of
	technological measures.</p>

	<h4><a name="section4"></a>4. Conveying Verbatim Copies.</h4>

	<p>You may convey verbatim copies of the Program's source code as you
	receive it, in any medium, provided that you conspicuously and
	appropriately publish on each copy an appropriate copyright notice;
	keep intact all notices stating that this License and any
	non-permissive terms added in accord with section 7 apply to the code;
	keep intact all notices of the absence of any warranty; and give all
	recipients a copy of this License along with the Program.</p>

	<p>You may charge any price or no price for each copy that you convey,
	and you may offer support or warranty protection for a fee.</p>

	<h4><a name="section5"></a>5. Conveying Modified Source Versions.</h4>

	<p>You may convey a work based on the Program, or the modifications to
	produce it from the Program, in the form of source code under the
	terms of section 4, provided that you also meet all of these conditions:</p>

	<ul>
	<li>a) The work must carry prominent notices stating that you modified
	it, and giving a relevant date.</li>

	<li>b) The work must carry prominent notices stating that it is
	released under this License and any conditions added under section
	7. This requirement modifies the requirement in section 4 to
	“keep intact all notices”.</li>

	<li>c) You must license the entire work, as a whole, under this
	License to anyone who comes into possession of a copy. This
	License will therefore apply, along with any applicable section 7
	additional terms, to the whole of the work, and all its parts,
	regardless of how they are packaged. This License gives no
	permission to license the work in any other way, but it does not
	invalidate such permission if you have separately received it.</li>

	<li>d) If the work has interactive user interfaces, each must display
	Appropriate Legal Notices; however, if the Program has interactive
	interfaces that do not display Appropriate Legal Notices, your
	work need not make them do so.</li>

	</ul>

	<p>A compilation of a covered work with other separate and independent
	works, which are not by their nature extensions of the covered work,
	and which are not combined with it such as to form a larger program,
	in or on a volume of a storage or distribution medium, is called an
	“aggregate” if the compilation and its resulting copyright are not
	used to limit the access or legal rights of the compilation's users
	beyond what the individual works permit. Inclusion of a covered work
	in an aggregate does not cause this License to apply to the other
	parts of the aggregate.</p>

	<h4><a name="section6"></a>6. Conveying Non-Source Forms.</h4>

	<p>You may convey a covered work in object code form under the terms
	of sections 4 and 5, provided that you also convey the
	machine-readable Corresponding Source under the terms of this License,
	in one of these ways:</p>

	<ul>
	<li>a) Convey the object code in, or embodied in, a physical product
	(including a physical distribution medium), accompanied by the
	Corresponding Source fixed on a durable physical medium
	customarily used for software interchange.</li>

	<li>b) Convey the object code in, or embodied in, a physical product
	(including a physical distribution medium), accompanied by a
	written offer, valid for at least three years and valid for as
	long as you offer spare parts or customer support for that product
	model, to give anyone who possesses the object code either (1) a
	copy of the Corresponding Source for all the software in the
	product that is covered by this License, on a durable physical
	medium customarily used for software interchange, for a price no
	more than your reasonable cost of physically performing this
	conveying of source, or (2) access to copy the
	Corresponding Source from a network server at no charge.</li>

	<li>c) Convey individual copies of the object code with a copy of the
	written offer to provide the Corresponding Source. This
	alternative is allowed only occasionally and noncommercially, and
	only if you received the object code with such an offer, in accord
	with subsection 6b.</li>

	<li>d) Convey the object code by offering access from a designated
	place (gratis or for a charge), and offer equivalent access to the
	Corresponding Source in the same way through the same place at no
	further charge. You need not require recipients to copy the
	Corresponding Source along with the object code. If the place to
	copy the object code is a network server, the Corresponding Source
	may be on a different server (operated by you or a third party)
	that supports equivalent copying facilities, provided you maintain
	clear directions next to the object code saying where to find the
	Corresponding Source. Regardless of what server hosts the
	Corresponding Source, you remain obligated to ensure that it is
	available for as long as needed to satisfy these requirements.</li>

	<li>e) Convey the object code using peer-to-peer transmission, provided
	you inform other peers where the object code and Corresponding
	Source of the work are being offered to the general public at no
	charge under subsection 6d.</li>
	</ul>

	<p>A separable portion of the object code, whose source code is excluded
	from the Corresponding Source as a System Library, need not be
	included in conveying the object code work.</p>

	<p>A “User Product” is either (1) a “consumer product”, which means any
	tangible personal property which is normally used for personal, family,
	or household purposes, or (2) anything designed or sold for incorporation
	into a dwelling. In determining whether a product is a consumer product,
	doubtful cases shall be resolved in favor of coverage. For a particular
	product received by a particular user, “normally used” refers to a
	typical or common use of that class of product, regardless of the status
	of the particular user or of the way in which the particular user
	actually uses, or expects or is expected to use, the product. A product
	is a consumer product regardless of whether the product has substantial
	commercial, industrial or non-consumer uses, unless such uses represent
	the only significant mode of use of the product.</p>

	<p>“Installation Information” for a User Product means any methods,
	procedures, authorization keys, or other information required to install
	and execute modified versions of a covered work in that User Product from
	a modified version of its Corresponding Source. The information must
	suffice to ensure that the continued functioning of the modified object
	code is in no case prevented or interfered with solely because
	modification has been made.</p>

	<p>If you convey an object code work under this section in, or with, or
	specifically for use in, a User Product, and the conveying occurs as
	part of a transaction in which the right of possession and use of the
	User Product is transferred to the recipient in perpetuity or for a
	fixed term (regardless of how the transaction is characterized), the
	Corresponding Source conveyed under this section must be accompanied
	by the Installation Information. But this requirement does not apply
	if neither you nor any third party retains the ability to install
	modified object code on the User Product (for example, the work has
	been installed in ROM).</p>

	<p>The requirement to provide Installation Information does not include a
	requirement to continue to provide support service, warranty, or updates
	for a work that has been modified or installed by the recipient, or for
	the User Product in which it has been modified or installed. Access to a
	network may be denied when the modification itself materially and
	adversely affects the operation of the network or violates the rules and
	protocols for communication across the network.</p>

	<p>Corresponding Source conveyed, and Installation Information provided,
	in accord with this section must be in a format that is publicly
	documented (and with an implementation available to the public in
	source code form), and must require no special password or key for
	unpacking, reading or copying.</p>

	<h4><a name="section7"></a>7. Additional Terms.</h4>

	<p>“Additional permissions” are terms that supplement the terms of this
	License by making exceptions from one or more of its conditions.
	Additional permissions that are applicable to the entire Program shall
	be treated as though they were included in this License, to the extent
	that they are valid under applicable law. If additional permissions
	apply only to part of the Program, that part may be used separately
	under those permissions, but the entire Program remains governed by
	this License without regard to the additional permissions.</p>

	<p>When you convey a copy of a covered work, you may at your option
	remove any additional permissions from that copy, or from any part of
	it. (Additional permissions may be written to require their own
	removal in certain cases when you modify the work.) You may place
	additional permissions on material, added by you to a covered work,
	for which you have or can give appropriate copyright permission.</p>

	<p>Notwithstanding any other provision of this License, for material you
	add to a covered work, you may (if authorized by the copyright holders of
	that material) supplement the terms of this License with terms:</p>

	<ul>
	<li>a) Disclaiming warranty or limiting liability differently from the
	terms of sections 15 and 16 of this License; or</li>

	<li>b) Requiring preservation of specified reasonable legal notices or
	author attributions in that material or in the Appropriate Legal
	Notices displayed by works containing it; or</li>

	<li>c) Prohibiting misrepresentation of the origin of that material, or
	requiring that modified versions of such material be marked in
	reasonable ways as different from the original version; or</li>

	<li>d) Limiting the use for publicity purposes of names of licensors or
	authors of the material; or</li>

	<li>e) Declining to grant rights under trademark law for use of some
	trade names, trademarks, or service marks; or</li>

	<li>f) Requiring indemnification of licensors and authors of that
	material by anyone who conveys the material (or modified versions of
	it) with contractual assumptions of liability to the recipient, for
	any liability that these contractual assumptions directly impose on
	those licensors and authors.</li>
	</ul>

	<p>All other non-permissive additional terms are considered “further
	restrictions” within the meaning of section 10. If the Program as you
	received it, or any part of it, contains a notice stating that it is
	governed by this License along with a term that is a further
	restriction, you may remove that term. If a license document contains
	a further restriction but permits relicensing or conveying under this
	License, you may add to a covered work material governed by the terms
	of that license document, provided that the further restriction does
	not survive such relicensing or conveying.</p>

	<p>If you add terms to a covered work in accord with this section, you
	must place, in the relevant source files, a statement of the
	additional terms that apply to those files, or a notice indicating
	where to find the applicable terms.</p>

	<p>Additional terms, permissive or non-permissive, may be stated in the
	form of a separately written license, or stated as exceptions;
	the above requirements apply either way.</p>

	<h4><a name="section8"></a>8. Termination.</h4>

	<p>You may not propagate or modify a covered work except as expressly
	provided under this License. Any attempt otherwise to propagate or
	modify it is void, and will automatically terminate your rights under
	this License (including any patent licenses granted under the third
	paragraph of section 11).</p>

	<p>However, if you cease all violation of this License, then your
	license from a particular copyright holder is reinstated (a)
	provisionally, unless and until the copyright holder explicitly and
	finally terminates your license, and (b) permanently, if the copyright
	holder fails to notify you of the violation by some reasonable means
	prior to 60 days after the cessation.</p>

	<p>Moreover, your license from a particular copyright holder is
	reinstated permanently if the copyright holder notifies you of the
	violation by some reasonable means, this is the first time you have
	received notice of violation of this License (for any work) from that
	copyright holder, and you cure the violation prior to 30 days after
	your receipt of the notice.</p>

	<p>Termination of your rights under this section does not terminate the
	licenses of parties who have received copies or rights from you under
	this License. If your rights have been terminated and not permanently
	reinstated, you do not qualify to receive new licenses for the same
	material under section 10.</p>

	<h4><a name="section9"></a>9. Acceptance Not Required for Having Copies.</h4>

	<p>You are not required to accept this License in order to receive or
	run a copy of the Program. Ancillary propagation of a covered work
	occurring solely as a consequence of using peer-to-peer transmission
	to receive a copy likewise does not require acceptance. However,
	nothing other than this License grants you permission to propagate or
	modify any covered work. These actions infringe copyright if you do
	not accept this License. Therefore, by modifying or propagating a
	covered work, you indicate your acceptance of this License to do so.</p>

	<h4><a name="section10"></a>10. Automatic Licensing of Downstream Recipients.</h4>

	<p>Each time you convey a covered work, the recipient automatically
	receives a license from the original licensors, to run, modify and
	propagate that work, subject to this License. You are not responsible
	for enforcing compliance by third parties with this License.</p>

	<p>An “entity transaction” is a transaction transferring control of an
	organization, or substantially all assets of one, or subdividing an
	organization, or merging organizations. If propagation of a covered
	work results from an entity transaction, each party to that
	transaction who receives a copy of the work also receives whatever
	licenses to the work the party's predecessor in interest had or could
	give under the previous paragraph, plus a right to possession of the
	Corresponding Source of the work from the predecessor in interest, if
	the predecessor has it or can get it with reasonable efforts.</p>

	<p>You may not impose any further restrictions on the exercise of the
	rights granted or affirmed under this License. For example, you may
	not impose a license fee, royalty, or other charge for exercise of
	rights granted under this License, and you may not initiate litigation
	(including a cross-claim or counterclaim in a lawsuit) alleging that
	any patent claim is infringed by making, using, selling, offering for
	sale, or importing the Program or any portion of it.</p>

	<h4><a name="section11"></a>11. Patents.</h4>

	<p>A “contributor” is a copyright holder who authorizes use under this
	License of the Program or a work on which the Program is based. The
	work thus licensed is called the contributor's “contributor version”.</p>

	<p>A contributor's “essential patent claims” are all patent claims
	owned or controlled by the contributor, whether already acquired or
	hereafter acquired, that would be infringed by some manner, permitted
	by this License, of making, using, or selling its contributor version,
	but do not include claims that would be infringed only as a
	consequence of further modification of the contributor version. For
	purposes of this definition, “control” includes the right to grant
	patent sublicenses in a manner consistent with the requirements of
	this License.</p>

	<p>Each contributor grants you a non-exclusive, worldwide, royalty-free
	patent license under the contributor's essential patent claims, to
	make, use, sell, offer for sale, import and otherwise run, modify and
	propagate the contents of its contributor version.</p>

	<p>In the following three paragraphs, a “patent license” is any express
	agreement or commitment, however denominated, not to enforce a patent
	(such as an express permission to practice a patent or covenant not to
	sue for patent infringement). To “grant” such a patent license to a
	party means to make such an agreement or commitment not to enforce a
	patent against the party.</p>

	<p>If you convey a covered work, knowingly relying on a patent license,
	and the Corresponding Source of the work is not available for anyone
	to copy, free of charge and under the terms of this License, through a
	publicly available network server or other readily accessible means,
	then you must either (1) cause the Corresponding Source to be so
	available, or (2) arrange to deprive yourself of the benefit of the
	patent license for this particular work, or (3) arrange, in a manner
	consistent with the requirements of this License, to extend the patent
	license to downstream recipients. “Knowingly relying” means you have
	actual knowledge that, but for the patent license, your conveying the
	covered work in a country, or your recipient's use of the covered work
	in a country, would infringe one or more identifiable patents in that
	country that you have reason to believe are valid.</p>


	<p>If, pursuant to or in connection with a single transaction or
	arrangement, you convey, or propagate by procuring conveyance of, a
	covered work, and grant a patent license to some of the parties
	receiving the covered work authorizing them to use, propagate, modify
	or convey a specific copy of the covered work, then the patent license
	you grant is automatically extended to all recipients of the covered
	work and works based on it.</p>

	<p>A patent license is “discriminatory” if it does not include within
	the scope of its coverage, prohibits the exercise of, or is
	conditioned on the non-exercise of one or more of the rights that are
	specifically granted under this License. You may not convey a covered
	work if you are a party to an arrangement with a third party that is
	in the business of distributing software, under which you make payment
	to the third party based on the extent of your activity of conveying
	the work, and under which the third party grants, to any of the
	parties who would receive the covered work from you, a discriminatory
	patent license (a) in connection with copies of the covered work
	conveyed by you (or copies made from those copies), or (b) primarily
	for and in connection with specific products or compilations that
	contain the covered work, unless you entered into that arrangement,
	or that patent license was granted, prior to 28 March 2007.</p>

	<p>Nothing in this License shall be construed as excluding or limiting
	any implied license or other defenses to infringement that may
	otherwise be available to you under applicable patent law.</p>

	<h4><a name="section12"></a>12. No Surrender of Others' Freedom.</h4>

	<p>If conditions are imposed on you (whether by court order, agreement or
	otherwise) that contradict the conditions of this License, they do not
	excuse you from the conditions of this License. If you cannot convey a
	covered work so as to satisfy simultaneously your obligations under this
	License and any other pertinent obligations, then as a consequence you may
	not convey it at all. For example, if you agree to terms that obligate you
	to collect a royalty for further conveying from those to whom you convey
	the Program, the only way you could satisfy both those terms and this
	License would be to refrain entirely from conveying the Program.</p>

	<h4><a name="section13"></a>13. Use with the GNU Affero General Public License.</h4>

	<p>Notwithstanding any other provision of this License, you have
	permission to link or combine any covered work with a work licensed
	under version 3 of the GNU Affero General Public License into a single
	combined work, and to convey the resulting work. The terms of this
	License will continue to apply to the part which is the covered work,
	but the special requirements of the GNU Affero General Public License,
	section 13, concerning interaction through a network will apply to the
	combination as such.</p>

	<h4><a name="section14"></a>14. Revised Versions of this License.</h4>

	<p>The Free Software Foundation may publish revised and/or new versions of
	the GNU General Public License from time to time. Such new versions will
	be similar in spirit to the present version, but may differ in detail to
	address new problems or concerns.</p>

	<p>Each version is given a distinguishing version number. If the
	Program specifies that a certain numbered version of the GNU General
	Public License “or any later version” applies to it, you have the
	option of following the terms and conditions either of that numbered
	version or of any later version published by the Free Software
	Foundation. If the Program does not specify a version number of the
	GNU General Public License, you may choose any version ever published
	by the Free Software Foundation.</p>

	<p>If the Program specifies that a proxy can decide which future
	versions of the GNU General Public License can be used, that proxy's
	public statement of acceptance of a version permanently authorizes you
	to choose that version for the Program.</p>

	<p>Later license versions may give you additional or different
	permissions. However, no additional obligations are imposed on any
	author or copyright holder as a result of your choosing to follow a
	later version.</p>

	<h4><a name="section15"></a>15. Disclaimer of Warranty.</h4>

	<p>THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
	APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
	HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY
	OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
	THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
	PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
	IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
	ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</p>

	<h4><a name="section16"></a>16. Limitation of Liability.</h4>

	<p>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
	WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
	THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
	GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
	USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
	DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
	PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
	EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
	SUCH DAMAGES.</p>

	<h4><a name="section17"></a>17. Interpretation of Sections 15 and 16.</h4>

	<p>If the disclaimer of warranty and limitation of liability provided
	above cannot be given local legal effect according to their terms,
	reviewing courts shall apply local law that most closely approximates
	an absolute waiver of all civil liability in connection with the
	Program, unless a warranty or assumption of liability accompanies a
	copy of the Program in return for a fee.</p>

	<p>END OF TERMS AND CONDITIONS</p>

	<h3><a name="howto"></a>How to Apply These Terms to Your New Programs</h3>

	<p>If you develop a new program, and you want it to be of the greatest
	possible use to the public, the best way to achieve this is to make it
	free software which everyone can redistribute and change under these terms.</p>

	<p>To do so, attach the following notices to the program. It is safest
	to attach them to the start of each source file to most effectively
	state the exclusion of warranty; and each file should have at least
	the “copyright” line and a pointer to where the full notice is found.</p>

	<pre> <one line to give the program's name and a brief idea of what it does.>
	Copyright (C) <year> <name of author>

	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/>.
	+ along with this program. If not, see <http://www.gnu.org/licenses/>.
	</pre>

	<p>Also add information on how to contact you by electronic and paper mail.</p>

	<p>If the program does terminal interaction, make it output a short
	notice like this when it starts in an interactive mode:</p>

	<pre> <program> Copyright (C) <year> <name of author>

	This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
	This is free software, and you are welcome to redistribute it
	under certain conditions; type `show c' for details.
	</pre>

	<p>The hypothetical commands `show w' and `show c' should show the appropriate
	parts of the General Public License. Of course, your program's commands
	might be different; for a GUI interface, you would use an “about box”.</p>

	<p>You should also get your employer (if you work as a programmer) or school,
	if any, to sign a “copyright disclaimer” for the program, if necessary.
	For more information on this, and how to apply and follow the GNU GPL, see
	<<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>.</p>

	<p>The GNU General Public License does not permit incorporating your program
	into proprietary programs. If your program is a subroutine library, you
	may consider it more useful to permit linking proprietary applications with
	the library. If this is what you want to do, use the GNU Lesser General
	Public License instead of this License. But first, please read
	<<a href="http://www.gnu.org/philosophy/why-not-lgpl.html">http://www.gnu.org/philosophy/why-not-lgpl.html</a>>.</p>

	</div>
	diff --git a/plugins/jqueryui/jqueryui.php b/plugins/jqueryui/jqueryui.php
	index db640d1aa..e9b3c215e 100644
	--- a/plugins/jqueryui/jqueryui.php
	+++ b/plugins/jqueryui/jqueryui.php
	@@ -1,82 +1,83 @@
	<?php

	/**
	* jQuery UI
	*
	* Provide the jQuery UI library with according themes.
	*
	* @version 1.9.1
	* @author Cor Bosman <roundcube@wa.ter.net>
	* @author Thomas Bruederli <roundcube@gmail.com>
	+ * @license GNU GPLv3+
	*/
	class jqueryui extends rcube_plugin
	{
	public $noajax = true;

	public function init()
	{
	$version = '1.9.1';

	$rcmail = rcmail::get_instance();
	$this->load_config();

	// include UI scripts
	$this->include_script("js/jquery-ui-$version.custom.min.js");

	// include UI stylesheet
	$skin = $rcmail->config->get('skin');
	$ui_map = $rcmail->config->get('jquery_ui_skin_map', array());
	$ui_theme = $ui_map[$skin] ? $ui_map[$skin] : $skin;

	if (file_exists($this->home . "/themes/$ui_theme/jquery-ui-$version.custom.css")) {
	$this->include_stylesheet("themes/$ui_theme/jquery-ui-$version.custom.css");
	}
	else {
	$this->include_stylesheet("themes/larry/jquery-ui-$version.custom.css");
	}

	if ($ui_theme == 'larry') {
	// patch dialog position function in order to fully fit the close button into the window
	$rcmail->output->add_script("jQuery.extend(jQuery.ui.dialog.prototype.options.position, {
	using: function(pos) {
	var me = jQuery(this),
	offset = me.css(pos).offset(),
	topOffset = offset.top - 12;
	if (topOffset < 0)
	me.css('top', pos.top - topOffset);
	if (offset.left + me.outerWidth() + 12 > jQuery(window).width())
	me.css('left', pos.left - 12);
	}
	});", 'foot');
	}

	// jquery UI localization
	$jquery_ui_i18n = $rcmail->config->get('jquery_ui_i18n', array('datepicker'));
	if (count($jquery_ui_i18n) > 0) {
	$lang_l = str_replace('_', '-', substr($_SESSION['language'], 0, 5));
	$lang_s = substr($_SESSION['language'], 0, 2);
	foreach ($jquery_ui_i18n as $package) {
	if (file_exists($this->home . "/js/i18n/jquery.ui.$package-$lang_l.js")) {
	$this->include_script("js/i18n/jquery.ui.$package-$lang_l.js");
	}
	else
	if (file_exists($this->home . "/js/i18n/jquery.ui.$package-$lang_s.js")) {
	$this->include_script("js/i18n/jquery.ui.$package-$lang_s.js");
	}
	}
	}

	// Date format for datepicker
	$date_format = $rcmail->config->get('date_format', 'Y-m-d');
	$date_format = strtr($date_format, array(
	'y' => 'y',
	'Y' => 'yy',
	'm' => 'mm',
	'n' => 'm',
	'd' => 'dd',
	'j' => 'd',
	));
	$rcmail->output->set_env('date_format', $date_format);
	}

	}
	diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve.php b/plugins/managesieve/lib/Roundcube/rcube_sieve.php
	index a04e3c2a4..3bd2978da 100644
	--- a/plugins/managesieve/lib/Roundcube/rcube_sieve.php
	+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve.php
	@@ -1,384 +1,384 @@
	<?php

	/**
	* Classes for managesieve operations (using PEAR::Net_Sieve)
	*
	* 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 version 2
	- * as published by the Free Software Foundation.
	+ * 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, write to the Free Software Foundation, Inc.,
	- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	+ * You should have received a copy of the GNU General Public License
	+ * along with this program. If not, see http://www.gnu.org/licenses/.
	*/

	// Managesieve Protocol: RFC5804

	define('SIEVE_ERROR_CONNECTION', 1);
	define('SIEVE_ERROR_LOGIN', 2);
	define('SIEVE_ERROR_NOT_EXISTS', 3); // script not exists
	define('SIEVE_ERROR_INSTALL', 4); // script installation
	define('SIEVE_ERROR_ACTIVATE', 5); // script activation
	define('SIEVE_ERROR_DELETE', 6); // script deletion
	define('SIEVE_ERROR_INTERNAL', 7); // internal error
	define('SIEVE_ERROR_DEACTIVATE', 8); // script activation
	define('SIEVE_ERROR_OTHER', 255); // other/unknown error


	class rcube_sieve
	{
	private $sieve; // Net_Sieve object
	private $error = false; // error flag
	private $list = array(); // scripts list

	public $script; // rcube_sieve_script object
	public $current; // name of currently loaded script
	private $exts; // array of supported extensions


	/**
	* Object constructor
	*
	* @param string Username (for managesieve login)
	* @param string Password (for managesieve login)
	* @param string Managesieve server hostname/address
	* @param string Managesieve server port number
	* @param string Managesieve authentication method
	* @param boolean Enable/disable TLS use
	* @param array Disabled extensions
	* @param boolean Enable/disable debugging
	* @param string Proxy authentication identifier
	* @param string Proxy authentication password
	*/
	public function __construct($username, $password='', $host='localhost', $port=2000,
	$auth_type=null, $usetls=true, $disabled=array(), $debug=false,
	$auth_cid=null, $auth_pw=null)
	{
	$this->sieve = new Net_Sieve();

	if ($debug) {
	$this->sieve->setDebug(true, array($this, 'debug_handler'));
	}

	if (PEAR::isError($this->sieve->connect($host, $port, null, $usetls))) {
	return $this->_set_error(SIEVE_ERROR_CONNECTION);
	}

	if (!empty($auth_cid)) {
	$authz = $username;
	$username = $auth_cid;
	$password = $auth_pw;
	}

	if (PEAR::isError($this->sieve->login($username, $password,
	$auth_type ? strtoupper($auth_type) : null, $authz))
	) {
	return $this->_set_error(SIEVE_ERROR_LOGIN);
	}

	$this->exts = $this->get_extensions();

	// disable features by config
	if (!empty($disabled)) {
	// we're working on lower-cased names
	$disabled = array_map('strtolower', (array) $disabled);
	foreach ($disabled as $ext) {
	if (($idx = array_search($ext, $this->exts)) !== false) {
	unset($this->exts[$idx]);
	}
	}
	}
	}

	public function __destruct() {
	$this->sieve->disconnect();
	}

	/**
	* Getter for error code
	*/
	public function error()
	{
	return $this->error ? $this->error : false;
	}

	/**
	* Saves current script into server
	*/
	public function save($name = null)
	{
	if (!$this->sieve)
	return $this->_set_error(SIEVE_ERROR_INTERNAL);

	if (!$this->script)
	return $this->_set_error(SIEVE_ERROR_INTERNAL);

	if (!$name)
	$name = $this->current;

	$script = $this->script->as_text();

	if (!$script)
	$script = '/* empty script */';

	if (PEAR::isError($this->sieve->installScript($name, $script)))
	return $this->_set_error(SIEVE_ERROR_INSTALL);

	return true;
	}

	/**
	* Saves text script into server
	*/
	public function save_script($name, $content = null)
	{
	if (!$this->sieve)
	return $this->_set_error(SIEVE_ERROR_INTERNAL);

	if (!$content)
	$content = '/* empty script */';

	if (PEAR::isError($this->sieve->installScript($name, $content)))
	return $this->_set_error(SIEVE_ERROR_INSTALL);

	return true;
	}

	/**
	* Activates specified script
	*/
	public function activate($name = null)
	{
	if (!$this->sieve)
	return $this->_set_error(SIEVE_ERROR_INTERNAL);

	if (!$name)
	$name = $this->current;

	if (PEAR::isError($this->sieve->setActive($name)))
	return $this->_set_error(SIEVE_ERROR_ACTIVATE);

	return true;
	}

	/**
	* De-activates specified script
	*/
	public function deactivate()
	{
	if (!$this->sieve)
	return $this->_set_error(SIEVE_ERROR_INTERNAL);

	if (PEAR::isError($this->sieve->setActive('')))
	return $this->_set_error(SIEVE_ERROR_DEACTIVATE);

	return true;
	}

	/**
	* Removes specified script
	*/
	public function remove($name = null)
	{
	if (!$this->sieve)
	return $this->_set_error(SIEVE_ERROR_INTERNAL);

	if (!$name)
	$name = $this->current;

	// script must be deactivated first
	if ($name == $this->sieve->getActive())
	if (PEAR::isError($this->sieve->setActive('')))
	return $this->_set_error(SIEVE_ERROR_DELETE);

	if (PEAR::isError($this->sieve->removeScript($name)))
	return $this->_set_error(SIEVE_ERROR_DELETE);

	if ($name == $this->current)
	$this->current = null;

	return true;
	}

	/**
	* Gets list of supported by server Sieve extensions
	*/
	public function get_extensions()
	{
	if ($this->exts)
	return $this->exts;

	if (!$this->sieve)
	return $this->_set_error(SIEVE_ERROR_INTERNAL);

	$ext = $this->sieve->getExtensions();
	// we're working on lower-cased names
	$ext = array_map('strtolower', (array) $ext);

	if ($this->script) {
	$supported = $this->script->get_extensions();
	foreach ($ext as $idx => $ext_name)
	if (!in_array($ext_name, $supported))
	unset($ext[$idx]);
	}

	return array_values($ext);
	}

	/**
	* Gets list of scripts from server
	*/
	public function get_scripts()
	{
	if (!$this->list) {

	if (!$this->sieve)
	return $this->_set_error(SIEVE_ERROR_INTERNAL);

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

	if (PEAR::isError($list))
	return $this->_set_error(SIEVE_ERROR_OTHER);

	$this->list = $list;
	}

	return $this->list;
	}

	/**
	* Returns active script name
	*/
	public function get_active()
	{
	if (!$this->sieve)
	return $this->_set_error(SIEVE_ERROR_INTERNAL);

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

	/**
	* Loads script by name
	*/
	public function load($name)
	{
	if (!$this->sieve)
	return $this->_set_error(SIEVE_ERROR_INTERNAL);

	if ($this->current == $name)
	return true;

	$script = $this->sieve->getScript($name);

	if (PEAR::isError($script))
	return $this->_set_error(SIEVE_ERROR_OTHER);

	// try to parse from Roundcube format
	$this->script = $this->_parse($script);

	$this->current = $name;

	return true;
	}

	/**
	* Loads script from text content
	*/
	public function load_script($script)
	{
	if (!$this->sieve)
	return $this->_set_error(SIEVE_ERROR_INTERNAL);

	// try to parse from Roundcube format
	$this->script = $this->_parse($script);
	}

	/**
	* Creates rcube_sieve_script object from text script
	*/
	private function _parse($txt)
	{
	// parse
	$script = new rcube_sieve_script($txt, $this->exts);

	// fix/convert to Roundcube format
	if (!empty($script->content)) {
	// replace all elsif with if+stop, we support only ifs
	foreach ($script->content as $idx => $rule) {
	if (empty($rule['type']) \|\| !preg_match('/^(if\|elsif\|else)$/', $rule['type'])) {
	continue;
	}

	$script->content[$idx]['type'] = 'if';

	// 'stop' not found?
	foreach ($rule['actions'] as $action) {
	if (preg_match('/^(stop\|vacation)$/', $action['type'])) {
	continue 2;
	}
	}
	if (!empty($script->content[$idx+1]) && $script->content[$idx+1]['type'] != 'if') {
	$script->content[$idx]['actions'][] = array('type' => 'stop');
	}
	}
	}

	return $script;
	}

	/**
	* Gets specified script as text
	*/
	public function get_script($name)
	{
	if (!$this->sieve)
	return $this->_set_error(SIEVE_ERROR_INTERNAL);

	$content = $this->sieve->getScript($name);

	if (PEAR::isError($content))
	return $this->_set_error(SIEVE_ERROR_OTHER);

	return $content;
	}

	/**
	* Creates empty script or copy of other script
	*/
	public function copy($name, $copy)
	{
	if (!$this->sieve)
	return $this->_set_error(SIEVE_ERROR_INTERNAL);

	if ($copy) {
	$content = $this->sieve->getScript($copy);

	if (PEAR::isError($content))
	return $this->_set_error(SIEVE_ERROR_OTHER);
	}

	return $this->save_script($name, $content);
	}

	private function _set_error($error)
	{
	$this->error = $error;
	return false;
	}

	/**
	* This is our own debug handler for connection
	*/
	public function debug_handler(&$sieve, $message)
	{
	rcube::write_log('sieve', preg_replace('/\r\n$/', '', $message));
	}
	}
	diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
	index d93194765..ac942d292 100644
	--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
	+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
	@@ -1,2122 +1,2122 @@
	<?php

	/**
	* Managesieve (Sieve Filters) Engine
	*
	* Engine part of Managesieve plugin implementing UI and backend access.
	*
	* Copyright (C) 2008-2013, The Roundcube Dev Team
	* Copyright (C) 2011-2013, 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 version 2
	- * as published by the Free Software Foundation.
	+ * 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, write to the Free Software Foundation, Inc.,
	- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	+ * 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
	{
	private $rc;
	private $sieve;
	private $errors;
	private $form;
	private $tips = array();
	private $script = array();
	private $exts = array();
	private $list;
	private $active = array();
	private $headers = array(
	'subject' => 'Subject',
	'from' => 'From',
	'to' => 'To',
	);
	private $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",
	);

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


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

	/**
	* Loads configuration, initializes plugin (including sieve connection)
	*/
	function start()
	{
	// 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'),
	));

	// 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' => $_SESSION['username'],
	'password' => $this->rc->decrypt($_SESSION['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'),
	));

	// 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']
	);

	if (!($error = $this->sieve->error())) {
	// Get list of scripts
	$list = $this->list_scripts();

	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'];
	}
	else {
	// get (first) active script
	if (!empty($this->active[0])) {
	$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);
	}

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

	// finally set script objects
	if ($error) {
	switch ($error) {
	case SIEVE_ERROR_CONNECTION:
	case SIEVE_ERROR_LOGIN:
	$this->rc->output->show_message('managesieve.filterconnerror', 'error');
	break;
	default:
	$this->rc->output->show_message('managesieve.filterunknownerror', 'error');
	break;
	}

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

	// 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->script = $this->sieve->script->as_array();
	$this->rc->output->set_env('currentset', $this->sieve->current);
	$_SESSION['managesieve_current'] = $this->sieve->current;
	}

	return $error;
	}

	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 = $rule['disabled'] ? true : false;
	$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_GPC, 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_GPC, 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_GPC, 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') {
	$script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
	$script = $this->sieve->get_script($script_name);

	if (PEAR::isError($script))
	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");
	if ($browser->ie && $browser->ver < 7)
	$filename = rawurlencode(abbreviate_string($script_name, 55));
	else if ($browser->ie)
	$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_GPC);
	$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_GPC);
	$id = $this->genid();
	$content = $this->action_div($fid, $id, false);

	$this->rc->output->command('managesieve_actionfill', $content, $id, $aid);
	}

	$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);
	$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);
	$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);
	$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);
	$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);
	$notifyaddrs = rcube_utils::get_input_value('_action_notifyaddress', rcube_utils::INPUT_POST);
	$notifybodies = rcube_utils::get_input_value('_action_notifybody', rcube_utils::INPUT_POST);
	$notifymessages = rcube_utils::get_input_value('_action_notifymessage', rcube_utils::INPUT_POST);
	$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'] = $_POST['_disabled'] ? true : false;
	$this->form['join'] = $join=='allof' ? true : false;
	$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 ($type != 'regex' && $type != 'matches') {
	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 ($type != 'regex' && $type != 'matches') {
	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 {
	$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 (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 (!count($headers))
	$this->errors['tests'][$i]['header'] = $this->plugin->gettext('cannotbeempty');
	else {
	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;
	}

	if ($type == 'exists') {
	$this->form['tests'][$i]['test'] = 'exists';
	$this->form['tests'][$i]['arg'] = $header == '...' ? $cust_header : $header;
	}
	else {
	$test = 'header';
	$header = $header == '...' ? $cust_header : $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) {
	if (preg_match('/^(value\|count)/', $this->form['tests'][$i]['type']))
	$comparator = 'i;ascii-numeric';

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

	$i++;
	}
	}

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

	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':
	$this->form['actions'][$i]['target'] = $target;

	if ($this->form['actions'][$i]['target'] == '')
	$this->errors['actions'][$i]['target'] = $this->plugin->gettext('cannotbeempty');
	else if (!rcube_utils::check_email($this->form['actions'][$i]['target']))
	$this->errors['actions'][$i]['target'] = $this->plugin->gettext('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]['subject'] = $subject[$idx];
	$this->form['actions'][$i]['addresses'] = array_shift($addresses);
	$this->form['actions'][$i][$interval_type] = $intervals[$idx];
	// @TODO: vacation :mime, :from, :handle

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

	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($notifyaddrs[$idx])) {
	$this->errors['actions'][$i]['address'] = $this->plugin->gettext('cannotbeempty');
	}
	else if (!rcube_utils::check_email($notifyaddrs[$idx])) {
	$this->errors['actions'][$i]['address'] = $this->plugin->gettext('noemailwarning');
	}
	if (!empty($notifyfrom[$idx]) && !rcube_utils::check_email($notifyfrom[$idx])) {
	$this->errors['actions'][$i]['from'] = $this->plugin->gettext('noemailwarning');
	}
	$this->form['actions'][$i]['address'] = $notifyaddrs[$idx];
	$this->form['actions'][$i]['body'] = $notifybodies[$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) {
	// zapis skryptu
	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' => rcube::Q($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();
	}
	}
	}

	$this->send();
	}

	private 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' => rcube::Q($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)
	{
	if (!$attrib['id'])
	$attrib['id'] = 'rcmfilterframe';

	$attrib['name'] = $attrib['id'];

	$this->rc->output->set_env('contentframe', $attrib['name']);
	$this->rc->output->set_env('blankpage', $attrib['src'] ?
	$this->rc->output->abs_url($attrib['src']) : 'program/resources/blank.gif');

	return $this->rc->output->frame($attrib);
	}

	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 (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 = isset($scr) ? 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 $name => $val)
	$select_header->add(rcube::Q($this->plugin->gettext($name)), Q($val));
	$select_header->add(rcube::Q($this->plugin->gettext('...')), '...');
	if (in_array('body', $this->exts))
	$select_header->add(rcube::Q($this->plugin->gettext('body')), 'body');
	$select_header->add(rcube::Q($this->plugin->gettext('size')), 'size');
	if (in_array('date', $this->exts)) {
	$select_header->add(rcube::Q($this->plugin->gettext('datetest')), 'date');
	$select_header->add(rcube::Q($this->plugin->gettext('currdate')), 'currentdate');
	}

	if (isset($rule['test'])) {
	if (in_array($rule['test'], array('header', 'address', 'envelope'))
	&& !is_array($rule['arg1']) && in_array($rule['arg1'], $this->headers)
	) {
	$test = $rule['arg1'];
	}
	else if ($rule['test'] == 'exists'
	&& !is_array($rule['arg']) && in_array($rule['arg'], $this->headers)
	) {
	$test = $rule['arg'];
	}
	else if (in_array($rule['test'], array('size', 'body', 'date', 'currentdate'))) {
	$test = $rule['test'];
	}
	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'] == 'exists') {
	$custom = (array) $rule['arg'];
	if (count($custom) == 1 && isset($this->headers[strtolower($custom[0])])) {
	unset($custom);
	}
	}

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

	// matching type select (operator)
	$select_op = new html_select(array('name' => "_rule_op[]", 'id' => 'rule_op'.$id,
	'style' => 'display:' .($rule['test']!='size' ? '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');
	}

	// (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' => $rule['test'] == 'currentdate' \|\| $rule['test'] == 'date' ? '' : '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'] : '');
	}

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

	$tout .= $select_op->show($test);
	$tout .= $this->list_input($id, 'rule_target', $target,
	$rule['test'] != 'size' && $rule['test'] != 'exists',
	$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 = $rule['test'] != 'size' && $rule['test'] != 'body';
	$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
	$mout .= '<div id="rule_comp' .$id. '" class="adv"' . ($rule['test'] == 'size' ? ' 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="'. 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>';
	}

	// 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;
	}

	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('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">';
	// shared targets
	$out .= '<input type="text" name="_action_target['.$id.']" id="action_target' .$id. '" '
	.'value="' .($action['type']=='redirect' ? rcube::Q($action['target'], 'strict', false) : ''). '" size="35" '
	.'style="display:' .($action['type']=='redirect' ? 'inline' : 'none') .'" '
	. $this->error_class($id, 'action', 'target', 'action_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);
	$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') . '>'
	. 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('vacationaddr')) . '</span><br />'
	. $this->list_input($id, 'action_addresses', $action['addresses'], true,
	$this->error_class($id, 'action', 'addresses', 'action_addresses'), 30);
	$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(isset($action['seconds']) ? $action['seconds'] : $action['days'], '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
	// skip :options tag - not used by the mailto method
	$out .= '<div id="action_notify' .$id.'" style="display:' .($action['type']=='notify' ? 'inline' : 'none') .'">';
	$out .= '<span class="label">' .rcube::Q($this->plugin->gettext('notifyaddress')) . '</span><br />'
	.'<input type="text" name="_action_notifyaddress['.$id.']" id="action_notifyaddress'.$id.'" '
	.'value="' . rcube::Q($action['address']) . '" size="35" '
	. $this->error_class($id, 'action', 'address', 'action_notifyaddress') .' />';
	$out .= '<br /><span class="label">'. rcube::Q($this->plugin->gettext('notifybody')) .'</span><br />'
	.'<textarea name="_action_notifybody['.$id.']" id="action_notifybody' .$id. '" '
	.'rows="3" cols="35" '. $this->error_class($id, 'action', 'method', 'action_notifybody') . '>'
	. rcube::Q($action['body'], 'strict', false) . "</textarea>\n";
	$out .= '<br /><span class="label">' .rcube::Q($this->plugin->gettext('notifysubject')) . '</span><br />'
	.'<input type="text" name="_action_notifymessage['.$id.']" id="action_notifymessage'.$id.'" '
	.'value="' . rcube::Q($action['message']) . '" size="35" '
	. $this->error_class($id, 'action', 'message', 'action_notifymessage') .' />';
	$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') .' />';
	$importance_options = array(
	3 => 'notifyimportancelow',
	2 => 'notifyimportancenormal',
	1 => 'notifyimportancehigh'
	);
	$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);
	}
	$out .= '<br /><span class="label">' . rcube::Q($this->plugin->gettext('notifyimportance')) . '</span><br />';
	$out .= $select_importance->show($action['importance'] ? $action['importance'] : 2);
	$out .= '</div>';

	// mailbox select
	if ($action['type'] == 'fileinto')
	$mailbox = $this->mod_mailbox($action['target'], 'out');
	else
	$mailbox = '';

	$select = $this->rc->folder_selector(array(
	'realnames' => false,
	'maxlength' => 100,
	'id' => 'action_mailbox' . $id,
	'name' => "_action_mailbox[$id]",
	'style' => 'display:'.(!isset($action) \|\| $action['type']=='fileinto' ? 'inline' : 'none')
	));
	$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;
	}

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

	private 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;
	}

	private 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 '';
	}

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

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

	private 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');
	}

	private 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
	*/
	private 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
	*/
	private 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']);
	$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);
	}
	}

	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 ($filter['type'] != 'if') {
	continue;
	}
	$fname = $filter['name'] ? $filter['name'] : "#$i";
	$result[] = array(
	'id' => $idx,
	'name' => rcube::Q($fname),
	'class' => $filter['disabled'] ? 'disabled' : '',
	);
	$i++;
	}

	return $result;
	}
	}
	diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
	index 78b4bc625..a614c3b15 100644
	--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
	+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
	@@ -1,1220 +1,1220 @@
	<?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 version 2
	- * as published by the Free Software Foundation.
	+ * 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, write to the Free Software Foundation, Inc.,
	- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	+ * 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( // Sieve extensions supported by class
	'body', // RFC5173
	'copy', // RFC3894
	'date', // RFC5260
	'enotify', // RFC5435
	'envelope', // RFC5228
	'ereject', // RFC5429
	'fileinto', // RFC5228
	'imapflags', // draft-melnikov-sieve-imapflags-06
	'imap4flags', // RFC5232
	'include', // draft-ietf-sieve-include-12
	'index', // RFC5260
	'notify', // draft-ietf-sieve-notify-00
	'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':
	$tests[$i] .= ($test['not'] ? 'not ' : '');
	$tests[$i] .= 'header';

	$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);
	}

	if (!empty($test['part'])) {
	$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;
	}
	$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';

	// Here we support only 00 version of notify draft, there
	// were a couple regressions in 00 to 04 changelog, we use
	// the version 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;

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

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

	if (!empty($action['address'])) {
	$method = 'mailto:' . $action['address'];
	if (!empty($action['body'])) {
	$method .= '?body=' . rawurlencode($action['body']);
	}
	}
	else {
	$method = $action['method'];
	}

	// method is optional in notify extension
	if (!empty($method)) {
	$action_script .= ($notify == 'notify' ? " :method " : " ") . 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();

	while ($script) {
	$script = trim($script);
	$rule = array();

	// Comments
	while (!empty($script) && $script[0] == '#') {
	$endl = strpos($script, "\n");
	$line = $endl ? substr($script, 0, $endl) : $script;

	// 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";
	}

	$script = ltrim(substr($script, strlen($line) + 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', $script)) {
	$rule = $this->_tokenize_rule($script);
	if (strlen($rulename) && !empty($rule)) {
	$rule['name'] = $rulename;
	}
	}
	// Simple commands
	else {
	$rule = $this->_parse_actions($script, ';');
	if (!empty($rule[0]) && is_array($rule)) {
	// set "global" variables
	if ($rule[0]['type'] == 'set') {
	unset($rule[0]['type']);
	$this->vars[] = $rule[0];
	}
	else {
	$rule = array('actions' => $rule);
	}
	}
	}

	$rulename = '';

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

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

	/**
	* Convert text script fragment to rule object
	*
	* @param string Text rule
	*
	* @return array Rule data
	*/
	private function _tokenize_rule(&$content)
	{
	$cond = strtolower(self::tokenize($content, 1));

	if ($cond != 'if' && $cond != 'elsif' && $cond != 'else') {
	return null;
	}

	$disabled = false;
	$join = false;

	// disabled rule (false + comment): if false # .....
	if (preg_match('/^\s*false\s+#/i', $content)) {
	$content = preg_replace('/^\sfalse\s+#\s/i', '', $content);
	$disabled = true;
	}

	while (strlen($content)) {
	$tokens = self::tokenize($content, true);
	$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;
	}

	switch ($token) {
	case 'allof':
	$join = true;
	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 '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)) {
	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 '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);

	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 Text body
	* @param string $end End of text separator
	*
	* @return array Array of parsed action type/target pairs
	*/
	private function _parse_actions(&$content, $end = '}')
	{
	$result = null;

	while (strlen($content)) {
	$tokens = self::tokenize($content, true);
	$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', 'importance', 'options', 'message', 'method');
	$args = array_keys($priorities);
	$action += $this->action_arguments($tokens, $args, $vargs);

	// Here we support only 00 version of notify draft, there
	// were a couple regressions in 00 to 04 changelog, we use
	// the version used by Cyrus
	if (!isset($action['importance'])) {
	foreach ($priorities as $key => $val) {
	if (isset($action[$key])) {
	$action['importance'] = $val;
	unset($action[$key]);
	}
	}
	}

	// unnamed parameter is a :method in enotify extension
	if (!isset($action['method'])) {
	$action['method'] = array_pop($tokens);
	}

	$method_components = parse_url($action['method']);
	if ($method_components['scheme'] == 'mailto') {
	$action['address'] = $method_components['path'];
	$method_params = array();
	if (array_key_exists('query', $method_components)) {
	parse_str($method_components['query'], $method_params);
	}
	$method_params = array_change_key_case($method_params, CASE_LOWER);
	// magic_quotes_gpc and magic_quotes_sybase affect the output of parse_str
	if (ini_get('magic_quotes_gpc') \|\| ini_get('magic_quotes_sybase')) {
	array_map('stripslashes', $method_params);
	}
	$action['body'] = (array_key_exists('body', $method_params)) ? $method_params['body'] : '';
	}

	$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 + comparator
	if (preg_match('/^(value\|count)-([gteqnl]{2})/', $test['type'], $m)) {
	array_push($exts, 'relational');
	array_push($exts, 'comparator-i;ascii-numeric');

	$out .= ' :' . $m[1] . ' "' . $m[2] . '" :comparator "i;ascii-numeric"';
	}
	else {
	$this->add_comparator($test, $out, $exts);

	if ($test['type'] == 'regex') {
	array_push($exts, 'regex');
	}

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

	/**
	* 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.
	*
	* @return mixed Tokens array or string if $num=1
	*/
	static function tokenize(&$str, $num=0)
	{
	$result = array();

	// remove spaces from the beginning of the string
	while (($str = ltrim($str)) !== ''
	&& (!$num \|\| $num === true \|\| count($result) < $num)
	) {
	switch ($str[0]) {

	// Quoted string
	case '"':
	$len = strlen($str);

	for ($pos=1; $pos<$len; $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, 1, $pos - 1));
	$str = substr($str, $pos + 1);
	break;

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

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

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

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

	// String atom
	default:
	// empty or one character
	if ($str === '' \|\| $str === null) {
	break 2;
	}
	if (strlen($str) < 2) {
	$result[] = $str;
	$str = '';
	break;
	}

	// tag/identifier/number
	if (preg_match('/^([a-z0-9:_]+)/i', $str, $m)) {
	$str = substr($str, strlen($m[1]));

	if ($m[1] != 'text:') {
	$result[] = $m[1];
	}
	// multiline string
	else {
	// possible hash-comment after "text:"
	if (preg_match('/^( \|\t)*(#[^\n]+)?\n/', $str, $m)) {
	$str = substr($str, strlen($m[0]));
	}
	// get text until alone dot in a line
	if (preg_match('/^(.*)\r?\n\.\r?\n/sU', $str, $m)) {
	$text = $m[1];
	// remove dot-stuffing
	$text = str_replace("\n..", "\n.", $text);
	$str = substr($str, strlen($m[0]));
	}
	else {
	$text = '';
	}

	$result[] = $text;
	}
	}
	// fallback, skip one character as infinite loop prevention
	else {
	$str = substr($str, 1);
	}

	break;
	}
	}

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

	}
	diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php
	index f99a3b866..6970193c2 100644
	--- a/plugins/managesieve/managesieve.php
	+++ b/plugins/managesieve/managesieve.php
	@@ -1,201 +1,201 @@
	<?php

	/**
	* Managesieve (Sieve Filters)
	*
	* Plugin that adds a possibility to manage Sieve filters in Thunderbird's style.
	* It's clickable interface which operates on text scripts and communicates
	* with server using managesieve protocol. Adds Filters tab in Settings.
	*
	* @version @package_version@
	* @author Aleksander Machniak <alec@alec.pl>
	*
	* Configuration (see config.inc.php.dist)
	*
	* Copyright (C) 2008-2013, The Roundcube Dev Team
	* Copyright (C) 2011-2013, 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 version 2
	- * as published by the Free Software Foundation.
	+ * 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, write to the Free Software Foundation, Inc.,
	- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	+ * 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 managesieve extends rcube_plugin
	{
	public $task = 'mail\|settings';
	private $rc;
	private $engine;

	function init()
	{
	$this->rc = rcmail::get_instance();

	// register actions
	$this->register_action('plugin.managesieve', array($this, 'managesieve_actions'));
	$this->register_action('plugin.managesieve-save', array($this, 'managesieve_save'));

	if ($this->rc->task == 'settings') {
	$this->init_ui();
	}
	else if ($this->rc->task == 'mail') {
	// register message hook
	$this->add_hook('message_headers_output', array($this, 'mail_headers'));

	// inject Create Filter popup stuff
	if (empty($this->rc->action) \|\| $this->rc->action == 'show') {
	$this->mail_task_handler();
	}
	}
	}

	/**
	* Initializes plugin's UI (localization, js script)
	*/
	function init_ui()
	{
	if ($this->ui_initialized) {
	return;
	}

	// load localization
	$this->add_texts('localization/', array('filters','managefilters'));
	$this->include_script('managesieve.js');

	$this->ui_initialized = true;
	}

	/**
	* Add UI elements to the 'mailbox view' and 'show message' UI.
	*/
	function mail_task_handler()
	{
	// make sure we're not in ajax request
	if ($this->rc->output->type != 'html') {
	return;
	}

	// use jQuery for popup window
	$this->require_plugin('jqueryui');

	// include js script and localization
	$this->init_ui();

	// include styles
	$skin_path = $this->local_skin_path();
	if (is_file($this->home . "/$skin_path/managesieve_mail.css")) {
	$this->include_stylesheet("$skin_path/managesieve_mail.css");
	}

	// add 'Create filter' item to message menu
	$this->api->add_content(html::tag('li', null,
	$this->api->output->button(array(
	'command' => 'managesieve-create',
	'label' => 'managesieve.filtercreate',
	'type' => 'link',
	'classact' => 'icon filterlink active',
	'class' => 'icon filterlink',
	'innerclass' => 'icon filterlink',
	))), 'messagemenu');

	// register some labels/messages
	$this->rc->output->add_label('managesieve.newfilter', 'managesieve.usedata',
	'managesieve.nodata', 'managesieve.nextstep', 'save');

	$this->rc->session->remove('managesieve_current');
	}

	/**
	* Get message headers for popup window
	*/
	function mail_headers($args)
	{
	// this hook can be executed many times
	if ($this->mail_headers_done) {
	return $args;
	}

	$this->mail_headers_done = true;

	$headers = $args['headers'];
	$ret = array();

	if ($headers->subject)
	$ret[] = array('Subject', rcube_mime::decode_header($headers->subject));

	// @TODO: List-Id, others?
	foreach (array('From', 'To') as $h) {
	$hl = strtolower($h);
	if ($headers->$hl) {
	$list = rcube_mime::decode_address_list($headers->$hl);
	foreach ($list as $item) {
	if ($item['mailto']) {
	$ret[] = array($h, $item['mailto']);
	}
	}
	}
	}

	if ($this->rc->action == 'preview')
	$this->rc->output->command('parent.set_env', array('sieve_headers' => $ret));
	else
	$this->rc->output->set_env('sieve_headers', $ret);


	return $args;
	}

	/**
	* Plugin action handler
	*/
	function managesieve_actions()
	{
	$this->init_ui();
	$engine = $this->get_engine();
	$engine->actions();
	}

	/**
	* Forms save action handler
	*/
	function managesieve_save()
	{
	// load localization
	$this->add_texts('localization/', array('filters','managefilters'));

	// include main js script
	if ($this->api->output->type == 'html') {
	$this->include_script('managesieve.js');
	}

	$engine = $this->get_engine();
	$engine->save();
	}

	/**
	* Initializes engine object
	*/
	private function get_engine()
	{
	if (!$this->engine) {
	$this->load_config();

	// Add include path for internal classes
	$include_path = $this->home . '/lib' . PATH_SEPARATOR;
	$include_path .= ini_get('include_path');
	set_include_path($include_path);

	$this->engine = new rcube_sieve_engine($this);
	}

	return $this->engine;
	}
	}
	diff --git a/plugins/managesieve/package.xml b/plugins/managesieve/package.xml
	index c0c21c9a0..9c02957a5 100644
	--- a/plugins/managesieve/package.xml
	+++ b/plugins/managesieve/package.xml
	@@ -1,128 +1,128 @@
	<?xml version="1.0" encoding="UTF-8"?>
	<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
	http://pear.php.net/dtd/tasks-1.0.xsd
	http://pear.php.net/dtd/package-2.0
	http://pear.php.net/dtd/package-2.0.xsd">
	<name>managesieve</name>
	<channel>pear.roundcube.net</channel>
	<summary>Sieve filters manager for Roundcube</summary>
	<description>
	Adds a possibility to manage Sieve scripts (incoming mail filters).
	It's clickable interface which operates on text scripts and communicates
	with server using managesieve protocol. Adds Filters tab in Settings.
	</description>
	<lead>
	<name>Aleksander Machniak</name>
	<user>alec</user>
	<email>alec@alec.pl</email>
	<active>yes</active>
	</lead>
	<date>2013-02-17</date>
	<version>
	<release>6.2</release>
	<api>6.0</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	- <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	+ <license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
	<notes>-</notes>
	<contents>
	<dir baseinstalldir="/" name="/">
	<file name="managesieve.php" role="php">
	<tasks:replace from="@name@" to="name" type="package-info"/>
	<tasks:replace from="@package_version@" to="version" type="package-info"/>
	</file>
	<file name="managesieve.js" role="data">
	<tasks:replace from="@name@" to="name" type="package-info"/>
	<tasks:replace from="@package_version@" to="version" type="package-info"/>
	</file>
	<file name="localization/be_BE.inc" role="data"></file>
	<file name="localization/bg_BG.inc" role="data"></file>
	<file name="localization/bs_BA.inc" role="data"></file>
	<file name="localization/ca_ES_BA.inc" role="data"></file>
	<file name="localization/cs_CZ.inc" role="data"></file>
	<file name="localization/cy_GB.inc" role="data"></file>
	<file name="localization/da_DK.inc" role="data"></file>
	<file name="localization/de_CH.inc" role="data"></file>
	<file name="localization/de_DE.inc" role="data"></file>
	<file name="localization/el_GR.inc" role="data"></file>
	<file name="localization/en_GB.inc" role="data"></file>
	<file name="localization/en_US.inc" role="data"></file>
	<file name="localization/eo.inc" role="data"></file>
	<file name="localization/es_AR.inc" role="data"></file>
	<file name="localization/es_ES.inc" role="data"></file>
	<file name="localization/et_EE.inc" role="data"></file>
	<file name="localization/fa_IR.inc" role="data"></file>
	<file name="localization/fi_FI.inc" role="data"></file>
	<file name="localization/fr_FR.inc" role="data"></file>
	<file name="localization/gl_ES.inc" role="data"></file>
	<file name="localization/he_IL.inc" role="data"></file>
	<file name="localization/hr_HR.inc" role="data"></file>
	<file name="localization/hu_HU.inc" role="data"></file>
	<file name="localization/ia_IA.inc" role="data"></file>
	<file name="localization/id_ID.inc" role="data"></file>
	<file name="localization/it_IT.inc" role="data"></file>
	<file name="localization/ja_JP.inc" role="data"></file>
	<file name="localization/lt_LT.inc" role="data"></file>
	<file name="localization/lv_LV.inc" role="data"></file>
	<file name="localization/ml_ML.inc" role="data"></file>
	<file name="localization/mr_IN.inc" role="data"></file>
	<file name="localization/nb_NO.inc" role="data"></file>
	<file name="localization/nl_NL.inc" role="data"></file>
	<file name="localization/pl_PL.inc" role="data"></file>
	<file name="localization/pt_BR.inc" role="data"></file>
	<file name="localization/pt_PT.inc" role="data"></file>
	<file name="localization/ro_RO.inc" role="data"></file>
	<file name="localization/ru_RU.inc" role="data"></file>
	<file name="localization/si_LK.inc" role="data"></file>
	<file name="localization/sk_SK.inc" role="data"></file>
	<file name="localization/sl_SI.inc" role="data"></file>
	<file name="localization/sv_SE.inc" role="data"></file>
	<file name="localization/tr_TR.inc" role="data"></file>
	<file name="localization/uk_UA.inc" role="data"></file>
	<file name="localization/vi_VN.inc" role="data"></file>
	<file name="localization/zh_CN.inc" role="data"></file>
	<file name="localization/zh_TW.inc" role="data"></file>
	<file name="skins/classic/managesieve.css" role="data"></file>
	<file name="skins/classic/managesieve_mail.css" role="data"></file>
	<file name="skins/classic/templates/filteredit.html" role="data"></file>
	<file name="skins/classic/templates/managesieve.html" role="data"></file>
	<file name="skins/classic/templates/setedit.html" role="data"></file>
	<file name="skins/classic/images/add.png" role="data"></file>
	<file name="skins/classic/images/del.png" role="data"></file>
	<file name="skins/classic/images/down_small.gif" role="data"></file>
	<file name="skins/classic/images/erase.png" role="data"></file>
	<file name="skins/classic/images/filter.png" role="data"></file>
	<file name="skins/classic/images/up_small.gif" role="data"></file>
	<file name="skins/larry/managesieve.css" role="data"></file>
	<file name="skins/larry/managesieve_mail.css" role="data"></file>
	<file name="skins/larry/templates/filteredit.html" role="data"></file>
	<file name="skins/larry/templates/managesieve.html" role="data"></file>
	<file name="skins/larry/templates/setedit.html" role="data"></file>
	<file name="skins/larry/images/add.png" role="data"></file>
	<file name="skins/larry/images/del.png" role="data"></file>
	<file name="skins/larry/images/down_small.gif" role="data"></file>
	<file name="skins/larry/images/erase.png" role="data"></file>
	<file name="skins/larry/images/up_small.gif" role="data"></file>
	<file name="lib/Roundcube/rcube_sieve.php" role="php"></file>
	<file name="lib/Roundcube/rcube_sieve_engine.php" role="php"></file>
	<file name="lib/Roundcube/rcube_sieve_script.php" role="php"></file>
	<file name="lib/Net/Sieve.php" role="php"></file>
	<file name="config.inc.php.dist" role="data"></file>
	</dir>
	<!-- / -->
	</contents>
	<dependencies>
	<required>
	<php>
	<min>5.2.1</min>
	</php>
	<pearinstaller>
	<min>1.7.0</min>
	</pearinstaller>
	</required>
	</dependencies>
	<phprelease/>
	</package>
	diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php
	index d32051e00..bb0821a53 100644
	--- a/plugins/new_user_identity/new_user_identity.php
	+++ b/plugins/new_user_identity/new_user_identity.php
	@@ -1,84 +1,85 @@
	<?php
	/**
	* New user identity
	*
	* Populates a new user's default identity from LDAP on their first visit.
	*
	* This plugin requires that a working public_ldap directory be configured.
	*
	* @version @package_version@
	* @author Kris Steinhoff
	+ * @license GNU GPLv3+
	*
	* Example configuration:
	*
	* // The id of the address book to use to automatically set a new
	* // user's full name in their new identity. (This should be an
	* // string, which refers to the $rcmail_config['ldap_public'] array.)
	* $rcmail_config['new_user_identity_addressbook'] = 'People';
	*
	* // When automatically setting a new users's full name in their
	* // new identity, match the user's login name against this field.
	* $rcmail_config['new_user_identity_match'] = 'uid';
	*/
	class new_user_identity extends rcube_plugin
	{
	public $task = 'login';

	private $ldap;

	function init()
	{
	$this->add_hook('user_create', array($this, 'lookup_user_name'));
	}

	function lookup_user_name($args)
	{
	if ($this->init_ldap($args['host'])) {
	$results = $this->ldap->search('*', $args['user'], true);
	if (count($results->records) == 1) {
	$user_name = is_array($results->records[0]['name']) ? $results->records[0]['name'][0] : $results->records[0]['name'];
	$user_email = is_array($results->records[0]['email']) ? $results->records[0]['email'][0] : $results->records[0]['email'];

	$args['user_name'] = $user_name;
	if (!$args['user_email'] && strpos($user_email, '@')) {
	$args['user_email'] = rcube_utils::idn_to_ascii($user_email);
	}
	}
	}
	return $args;
	}

	private function init_ldap($host)
	{
	if ($this->ldap) {
	return $this->ldap->ready;
	}

	$rcmail = rcmail::get_instance();

	$addressbook = $rcmail->config->get('new_user_identity_addressbook');
	$ldap_config = (array)$rcmail->config->get('ldap_public');
	$match = $rcmail->config->get('new_user_identity_match');

	if (empty($addressbook) \|\| empty($match) \|\| empty($ldap_config[$addressbook])) {
	return false;
	}

	$this->ldap = new new_user_identity_ldap_backend(
	$ldap_config[$addressbook],
	$rcmail->config->get('ldap_debug'),
	$rcmail->config->mail_domain($host),
	$match);

	return $this->ldap->ready;
	}
	}

	class new_user_identity_ldap_backend extends rcube_ldap
	{
	function __construct($p, $debug, $mail_domain, $search)
	{
	parent::__construct($p, $debug, $mail_domain);
	$this->prop['search_fields'] = (array)$search;
	}
	}
	diff --git a/plugins/new_user_identity/package.xml b/plugins/new_user_identity/package.xml
	index e50cd9255..45a3c4c8d 100644
	--- a/plugins/new_user_identity/package.xml
	+++ b/plugins/new_user_identity/package.xml
	@@ -1,49 +1,49 @@
	<?xml version="1.0" encoding="UTF-8"?>
	<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
	http://pear.php.net/dtd/tasks-1.0.xsd
	http://pear.php.net/dtd/package-2.0
	http://pear.php.net/dtd/package-2.0.xsd">
	<name>new_user_identity</name>
	<channel>pear.roundcube.net</channel>
	<summary>Populates a new user's default identity from LDAP on their first visit.</summary>
	<description>
	Populates a new user's default identity from LDAP on their first visit.
	</description>
	<lead>
	<name>Aleksander Machniak</name>
	<user>alec</user>
	<email>alec@alec.pl</email>
	<active>yes</active>
	</lead>
	<date>2012-08-13</date>
	<version>
	<release>1.0.7</release>
	<api>1.1</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	- <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	+ <license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
	<notes>-</notes>
	<contents>
	<dir baseinstalldir="/" name="/">
	<file name="new_user_identity.php" role="php">
	<tasks:replace from="@name@" to="name" type="package-info"/>
	<tasks:replace from="@package_version@" to="version" type="package-info"/>
	</file>
	</dir>
	<!-- / -->
	</contents>
	<dependencies>
	<required>
	<php>
	<min>5.2.1</min>
	</php>
	<pearinstaller>
	<min>1.7.0</min>
	</pearinstaller>
	</required>
	</dependencies>
	<phprelease/>
	</package>
	diff --git a/plugins/newmail_notifier/newmail_notifier.php b/plugins/newmail_notifier/newmail_notifier.php
	index 61f7bdbaa..ca1c2ff67 100644
	--- a/plugins/newmail_notifier/newmail_notifier.php
	+++ b/plugins/newmail_notifier/newmail_notifier.php
	@@ -1,193 +1,193 @@
	<?php

	/**
	* New Mail Notifier plugin
	*
	* Supports three methods of notification:
	* 1. Basic - focus browser window and change favicon
	* 2. Sound - play wav file
	* 3. Desktop - display desktop notification (using webkitNotifications feature,
	* supported by Chrome and Firefox with 'HTML5 Notifications' plugin)
	*
	* @version @package_version@
	* @author Aleksander Machniak <alec@alec.pl>
	*
	*
	* 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 version 2
	- * as published by the Free Software Foundation.
	+ * 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, write to the Free Software Foundation, Inc.,
	- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	+ * 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 newmail_notifier extends rcube_plugin
	{
	public $task = 'mail\|settings';

	private $rc;
	private $notified;
	private $opt = array();
	private $exceptions = array();


	/**
	* Plugin initialization
	*/
	function init()
	{
	$this->rc = rcmail::get_instance();

	// Preferences hooks
	if ($this->rc->task == 'settings') {
	$this->add_hook('preferences_list', array($this, 'prefs_list'));
	$this->add_hook('preferences_save', array($this, 'prefs_save'));
	}
	else { // if ($this->rc->task == 'mail') {
	// add script when not in ajax and not in frame
	if ($this->rc->output->type == 'html' && empty($_REQUEST['_framed'])) {
	$this->add_texts('localization/');
	$this->rc->output->add_label('newmail_notifier.title', 'newmail_notifier.body');
	$this->include_script('newmail_notifier.js');
	}

	if ($this->rc->action == 'refresh') {
	// Load configuration
	$this->load_config();

	$this->opt['basic'] = $this->rc->config->get('newmail_notifier_basic');
	$this->opt['sound'] = $this->rc->config->get('newmail_notifier_sound');
	$this->opt['desktop'] = $this->rc->config->get('newmail_notifier_desktop');

	if (!empty($this->opt)) {
	// Get folders to skip checking for
	$exceptions = array('drafts_mbox', 'sent_mbox', 'trash_mbox');
	foreach ($exceptions as $folder) {
	$folder = $this->rc->config->get($folder);
	if (strlen($folder) && $folder != 'INBOX') {
	$this->exceptions[] = $folder;
	}
	}

	$this->add_hook('new_messages', array($this, 'notify'));
	}
	}
	}
	}

	/**
	* Handler for user preferences form (preferences_list hook)
	*/
	function prefs_list($args)
	{
	if ($args['section'] != 'mailbox') {
	return $args;
	}

	// Load configuration
	$this->load_config();

	// Load localization and configuration
	$this->add_texts('localization/');

	if (!empty($_REQUEST['_framed'])) {
	$this->rc->output->add_label('newmail_notifier.title', 'newmail_notifier.testbody',
	'newmail_notifier.desktopunsupported', 'newmail_notifier.desktopenabled', 'newmail_notifier.desktopdisabled');
	$this->include_script('newmail_notifier.js');
	}

	// Check that configuration is not disabled
	$dont_override = (array) $this->rc->config->get('dont_override', array());

	foreach (array('basic', 'desktop', 'sound') as $type) {
	$key = 'newmail_notifier_' . $type;
	if (!in_array($key, $dont_override)) {
	$field_id = '_' . $key;
	$input = new html_checkbox(array('name' => $field_id, 'id' => $field_id, 'value' => 1));
	$content = $input->show($this->rc->config->get($key))
	. ' ' . html::a(array('href' => '#', 'onclick' => 'newmail_notifier_test_'.$type.'()'),
	$this->gettext('test'));

	$args['blocks']['new_message']['options'][$key] = array(
	'title' => html::label($field_id, rcube::Q($this->gettext($type))),
	'content' => $content
	);
	}
	}

	return $args;
	}

	/**
	* Handler for user preferences save (preferences_save hook)
	*/
	function prefs_save($args)
	{
	if ($args['section'] != 'mailbox') {
	return $args;
	}

	// Load configuration
	$this->load_config();

	// Check that configuration is not disabled
	$dont_override = (array) $this->rc->config->get('dont_override', array());

	foreach (array('basic', 'desktop', 'sound') as $type) {
	$key = 'newmail_notifier_' . $type;
	if (!in_array($key, $dont_override)) {
	$args['prefs'][$key] = rcube_utils::get_input_value('_'.$key, rcube_utils::INPUT_POST) ? true : false;
	}
	}

	return $args;
	}

	/**
	* Handler for new message action (new_messages hook)
	*/
	function notify($args)
	{
	// Already notified or unexpected input
	if ($this->notified \|\| empty($args['diff']['new'])) {
	return $args;
	}

	$mbox = $args['mailbox'];
	$storage = $this->rc->get_storage();
	$delimiter = $storage->get_hierarchy_delimiter();

	// Skip exception (sent/drafts) folders (and their subfolders)
	foreach ($this->exceptions as $folder) {
	if (strpos($mbox.$delimiter, $folder.$delimiter) === 0) {
	return $args;
	}
	}

	// Check if any of new messages is UNSEEN
	$deleted = $this->rc->config->get('skip_deleted') ? 'UNDELETED ' : '';
	$search = $deleted . 'UNSEEN UID ' . $args['diff']['new'];
	$unseen = $storage->search_once($mbox, $search);

	if ($unseen->count()) {
	$this->notified = true;

	$this->rc->output->command('plugin.newmail_notifier',
	array(
	'basic' => $this->opt['basic'],
	'sound' => $this->opt['sound'],
	'desktop' => $this->opt['desktop'],
	));
	}

	return $args;
	}
	}
	diff --git a/plugins/newmail_notifier/package.xml b/plugins/newmail_notifier/package.xml
	index ea0fcd9c1..b8ef34933 100644
	--- a/plugins/newmail_notifier/package.xml
	+++ b/plugins/newmail_notifier/package.xml
	@@ -1,70 +1,70 @@
	<?xml version="1.0" encoding="UTF-8"?>
	<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
	http://pear.php.net/dtd/tasks-1.0.xsd
	http://pear.php.net/dtd/package-2.0
	http://pear.php.net/dtd/package-2.0.xsd">
	<name>newmail_notifier</name>
	<channel>pear.roundcube.net</channel>
	<summary>Displays notification about a new mail</summary>
	<description>
	Supports three methods of notification:
	1. Basic - focus browser window and change favicon
	2. Sound - play wav file
	3. Desktop - display desktop notification (using webkitNotifications feature,
	supported by Chrome and Firefox with 'HTML5 Notifications' plugin).
	</description>
	<lead>
	<name>Aleksander Machniak</name>
	<user>alec</user>
	<email>alec@alec.pl</email>
	<active>yes</active>
	</lead>
	<date>2013-03-16</date>
	<version>
	<release>0.5</release>
	<api>0.5</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	- <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	+ <license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
	<notes>-</notes>
	<contents>
	<dir baseinstalldir="/" name="/">
	<file name="newmail_notifier.php" role="php">
	<tasks:replace from="@name@" to="name" type="package-info"/>
	<tasks:replace from="@package_version@" to="version" type="package-info"/>
	</file>
	<file name="newmail_notifier.js" role="data">
	<tasks:replace from="@name@" to="name" type="package-info"/>
	<tasks:replace from="@package_version@" to="version" type="package-info"/>
	</file>
	<file name="config.inc.php.dist" role="data"></file>
	<file name="favicon.ico" role="data"></file>
	<file name="mail.png" role="data"></file>
	<file name="sound.wav" role="data"></file>
	<file name="localization/de_CH.inc" role="data"></file>
	<file name="localization/de_DE.inc" role="data"></file>
	<file name="localization/en_US.inc" role="data"></file>
	<file name="localization/ja_JP.inc" role="data"></file>
	<file name="localization/lv_LV.inc" role="data"></file>
	<file name="localization/pl_PL.inc" role="data"></file>
	<file name="localization/pt_BR.inc" role="data"></file>
	<file name="localization/ru_RU.inc" role="data"></file>
	<file name="localization/sv_SE.inc" role="data"></file>
	</dir>
	<!-- / -->
	</contents>
	<dependencies>
	<required>
	<php>
	<min>5.2.1</min>
	</php>
	<pearinstaller>
	<min>1.7.0</min>
	</pearinstaller>
	</required>
	</dependencies>
	<phprelease/>
	</package>
	diff --git a/plugins/password/package.xml b/plugins/password/package.xml
	index 81427a986..16eda1ad0 100644
	--- a/plugins/password/package.xml
	+++ b/plugins/password/package.xml
	@@ -1,381 +1,381 @@
	<?xml version="1.0" encoding="UTF-8"?>
	<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
	http://pear.php.net/dtd/tasks-1.0.xsd
	http://pear.php.net/dtd/package-2.0
	http://pear.php.net/dtd/package-2.0.xsd">
	<name>password</name>
	<channel>pear.roundcube.net</channel>
	<summary>Password Change for Roundcube</summary>
	<description>Plugin that adds a possibility to change user password using many
	methods (drivers) via Settings/Password tab.
	</description>
	<lead>
	<name>Aleksander Machniak</name>
	<user>alec</user>
	<email>alec@alec.pl</email>
	<active>yes</active>
	</lead>
	<date>2013-04-28</date>
	<version>
	<release>3.4</release>
	<api>2.0</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	- <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	+ <license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
	<notes>
	Added password_force_save option
	</notes>
	<contents>
	<dir baseinstalldir="/" name="/">
	<file name="password.php" role="php">
	<tasks:replace from="@name@" to="name" type="package-info"/>
	<tasks:replace from="@package_version@" to="version" type="package-info"/>
	</file>
	<file name="password.js" role="data">
	<tasks:replace from="@name@" to="name" type="package-info"/>
	<tasks:replace from="@package_version@" to="version" type="package-info"/>
	</file>
	<file name="README" role="data">
	<tasks:replace from="@name@" to="name" type="package-info"/>
	<tasks:replace from="@package_version@" to="version" type="package-info"/>
	</file>
	<file name="localization/az_AZ.inc" role="data"></file>
	<file name="localization/bg_BG.inc" role="data"></file>
	<file name="localization/ca_ES.inc" role="data"></file>
	<file name="localization/cs_CZ.inc" role="data"></file>
	<file name="localization/da_DK.inc" role="data"></file>
	<file name="localization/de_CH.inc" role="data"></file>
	<file name="localization/de_DE.inc" role="data"></file>
	<file name="localization/en_US.inc" role="data"></file>
	<file name="localization/es_AR.inc" role="data"></file>
	<file name="localization/es_ES.inc" role="data"></file>
	<file name="localization/et_EE.inc" role="data"></file>
	<file name="localization/fi_FI.inc" role="data"></file>
	<file name="localization/fr_FR.inc" role="data"></file>
	<file name="localization/gl_ES.inc" role="data"></file>
	<file name="localization/hr_HR.inc" role="data"></file>
	<file name="localization/hu_HU.inc" role="data"></file>
	<file name="localization/it_IT.inc" role="data"></file>
	<file name="localization/ja_JA.inc" role="data"></file>
	<file name="localization/lt_LT.inc" role="data"></file>
	<file name="localization/lv_LV.inc" role="data"></file>
	<file name="localization/nl_NL.inc" role="data"></file>
	<file name="localization/pl_PL.inc" role="data"></file>
	<file name="localization/pt_BR.inc" role="data"></file>
	<file name="localization/pt_PT.inc" role="data"></file>
	<file name="localization/ru_RU.inc" role="data"></file>
	<file name="localization/sk_SK.inc" role="data"></file>
	<file name="localization/sl_SI.inc" role="data"></file>
	<file name="localization/sv_SE.inc" role="data"></file>
	<file name="localization/tr_TR.inc" role="data"></file>
	<file name="localization/zh_TW.inc" role="data"></file>

	<file name="drivers/chpasswd.php" role="php"></file>
	<file name="drivers/dbmail.php" role="php"></file>
	<file name="drivers/directadmin.php" role="php"></file>
	<file name="drivers/domainfactory.php" role="php"></file>
	<file name="drivers/expect.php" role="php"></file>
	<file name="drivers/ldap.php" role="php"></file>
	<file name="drivers/ldap_simple.php" role="php"></file>
	<file name="drivers/poppassd.php" role="php"></file>
	<file name="drivers/sql.php" role="php"></file>
	<file name="drivers/vpopmaild.php" role="php"></file>
	<file name="drivers/cpanel.php" role="php"></file>
	<file name="drivers/hmail.php" role="php"></file>
	<file name="drivers/pam.php" role="php"></file>
	<file name="drivers/pw_usermod.php" role="php"></file>
	<file name="drivers/sasl.php" role="php"></file>
	<file name="drivers/smb.php" role="php"></file>
	<file name="drivers/virtualmin.php" role="php"></file>
	<file name="drivers/ximss.php" role="php"></file>
	<file name="drivers/xmail.php" role="php"></file>

	<file name="helpers/chgdbmailusers.c" role="data"></file>
	<file name="helpers/chgsaslpasswd.c" role="data"></file>
	<file name="helpers/chgvirtualminpasswd.c" role="data"></file>
	<file name="helpers/chpass-wrapper.py" role="data"></file>
	<file name="helpers/passwd-expect" role="data"></file>

	<file name="config.inc.php.disc" role="data"></file>
	</dir>
	<!-- / -->
	</contents>
	<dependencies>
	<required>
	<php>
	<min>5.2.1</min>
	</php>
	<pearinstaller>
	<min>1.7.0</min>
	</pearinstaller>
	</required>
	</dependencies>
	<phprelease/>
	<changelog>
	<release>
	<date>2010-04-29</date>
	<time>12:00:00</time>
	<version>
	<release>1.4</release>
	<api>1.4</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	<notes>
	- Use mail_domain value for domain variables when there is no domain in username:
	sql and ldap drivers (#1486694)
	- Created package.xml
	</notes>
	</release>
	<release>
	<date>2010-06-20</date>
	<time>12:00:00</time>
	<version>
	<release>1.5</release>
	<api>1.5</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	<notes>
	- Removed user_login/username_local/username_domain methods,
	use rcube_user::get_username instead (#1486707)
	</notes>
	</release>
	<release>
	<date>2010-08-01</date>
	<time>09:00:00</time>
	<version>
	<release>1.6</release>
	<api>1.5</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	<notes>
	- Added ldap_simple driver
	</notes>
	</release>
	<release>
	<date>2010-09-10</date>
	<time>09:00:00</time>
	<version>
	<release>1.7</release>
	<api>1.5</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	<notes>
	- Added XMail driver
	- Improve security of chpasswd driver using popen instead of exec+echo (#1486987)
	- Added chpass-wrapper.py script to improve security (#1486987)
	</notes>
	</release>
	<release>
	<date>2010-09-29</date>
	<time>19:00:00</time>
	<version>
	<release>1.8</release>
	<api>1.6</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	<notes>
	- Added possibility to display extended error messages (#1486704)
	- Added extended error messages in Poppassd driver (#1486704)
	</notes>
	</release>
	<release>
	<version>
	<release>1.9</release>
	<api>1.6</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	<notes>
	- Added password_ldap_lchattr option (#1486927)
	</notes>
	</release>
	<release>
	<date>2010-10-07</date>
	<time>09:00:00</time>
	<version>
	<release>2.0</release>
	<api>1.6</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	<notes>
	- Fixed SQL Injection in SQL driver when using %p or %o variables in query (#1487034)
	</notes>
	</release>
	<release>
	<date>2010-11-02</date>
	<time>09:00:00</time>
	<version>
	<release>2.1</release>
	<api>1.6</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	<notes>
	- hMail driver: Add possibility to connect to remote host
	</notes>
	</release>
	<release>
	<date>2011-02-15</date>
	<time>12:00</time>
	<version>
	<release>2.2</release>
	<api>1.6</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	<notes>
	- hMail driver: add username_domain detection (#1487100)
	- hMail driver: HTML tags in logged messages should be stripped off (#1487099)
	- Chpasswd driver: add newline at end of input to chpasswd binary (#1487141)
	- Fix usage of configured temp_dir instead of /tmp (#1487447)
	- ldap_simple driver: fix parse error
	- ldap/ldap_simple drivers: support %dc variable in config
	- ldap/ldap_simple drivers: support Samba password change
	- Fix extended error messages handling (#1487676)
	- Fix double request when clicking on Password tab in Firefox
	- Fix deprecated split() usage in xmail and directadmin drivers (#1487769)
	- Added option (password_log) for logging password changes
	- Virtualmin driver: Add option for setting username format (#1487781)
	</notes>
	</release>
	<release>
	<date>2011-10-26</date>
	<time>12:00</time>
	<version>
	<release>2.3</release>
	<api>1.6</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	<notes>
	- When old and new passwords are the same, do nothing, return success (#1487823)
	- Fixed Samba password hashing in 'ldap' driver
	- Added 'password_change' hook for plugin actions after successful password change
	- Fixed bug where 'doveadm pw' command was used as dovecotpw utility
	- Improve generated crypt() passwords (#1488136)
	</notes>
	</release>
	<release>
	<date>2011-11-23</date>
	<version>
	<release>2.4</release>
	<api>1.6</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	<notes>
	- Added option to use punycode or unicode for domain names (#1488103)
	- Save Samba password hashes in capital letters (#1488197)
	</notes>
	</release>
	<release>
	<date>2011-11-23</date>
	<version>
	<release>3.0</release>
	<api>2.0</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	<notes>
	- Fixed drivers namespace issues
	</notes>
	</release>
	<release>
	<date>2012-03-07</date>
	<version>
	<release>3.1</release>
	<api>2.0</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	<notes>
	- Added pw_usermod driver (#1487826)
	- Added option password_login_exceptions (#1487826)
	- Added domainfactory driver (#1487882)
	- Added DBMail driver (#1488281)
	- Helper files moved to helpers/ directory from drivers/
	- Added Expect driver (#1488363)
	- Added Samba password (#1488364)
	</notes>
	</release>
	<release>
	<date>2012-11-15</date>
	<version>
	<release>3.2</release>
	<api>2.0</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	<notes>
	- Fix wrong (non-specific) error message on crypt or connection error (#1488808)
	- Added option to define IMAP hosts that support password changes - password_hosts
	</notes>
	</release>
	<release>
	<date>2013-03-30</date>
	<version>
	<release>3.3</release>
	<api>2.0</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	<notes>
	Added new cPanel driver - fixes localization related issues (#1487015)
	</notes>
	</release>
	</changelog>
	</package>
	diff --git a/plugins/password/password.php b/plugins/password/password.php
	index e16b4d0b9..f1a3e17b9 100644
	--- a/plugins/password/password.php
	+++ b/plugins/password/password.php
	@@ -1,298 +1,292 @@
	<?php

	-/*
	- +-------------------------------------------------------------------------+
	- \| Password Plugin for Roundcube \|
	- \| @version @package_version@ \|
	- \| \|
	- \| Copyright (C) 2009-2010, Roundcube Dev. \|
	- \| \|
	- \| This program is free software; you can redistribute it and/or modify \|
	- \| it under the terms of the GNU General Public License version 2 \|
	- \| as published by the Free Software Foundation. \|
	- \| \|
	- \| 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, write to the Free Software Foundation, Inc., \|
	- \| 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. \|
	- \| \|
	- +-------------------------------------------------------------------------+
	- \| Author: Aleksander Machniak <alec@alec.pl> \|
	- +-------------------------------------------------------------------------+
	-
	- $Id: index.php 2645 2009-06-15 07:01:36Z alec $
	-
	-*/
	+/**
	+ * Password Plugin for Roundcube
	+ *
	+ * @version @package_version@
	+ * @author Aleksander Machniak <alec@alec.pl>
	+ *
	+ * Copyright (C) 2005-2013, The Roundcube Dev Team
	+ *
	+ * 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/.
	+ */

	define('PASSWORD_CRYPT_ERROR', 1);
	define('PASSWORD_ERROR', 2);
	define('PASSWORD_CONNECT_ERROR', 3);
	define('PASSWORD_SUCCESS', 0);

	/**
	* Change password plugin
	*
	* Plugin that adds functionality to change a users password.
	* It provides common functionality and user interface and supports
	* several backends to finally update the password.
	*
	* For installation and configuration instructions please read the README file.
	*
	* @author Aleksander Machniak
	*/
	class password extends rcube_plugin
	{
	public $task = 'settings';
	public $noframe = true;
	public $noajax = true;

	function init()
	{
	$rcmail = rcmail::get_instance();

	$this->load_config();

	// Host exceptions
	$hosts = $rcmail->config->get('password_hosts');
	if (!empty($hosts) && !in_array($_SESSION['storage_host'], $hosts)) {
	return;
	}

	// Login exceptions
	if ($exceptions = $rcmail->config->get('password_login_exceptions')) {
	$exceptions = array_map('trim', (array) $exceptions);
	$exceptions = array_filter($exceptions);
	$username = $_SESSION['username'];

	foreach ($exceptions as $ec) {
	if ($username === $ec) {
	return;
	}
	}
	}

	// add Tab label
	$rcmail->output->add_label('password');
	$this->register_action('plugin.password', array($this, 'password_init'));
	$this->register_action('plugin.password-save', array($this, 'password_save'));
	$this->include_script('password.js');
	}

	function password_init()
	{
	$this->add_texts('localization/');
	$this->register_handler('plugin.body', array($this, 'password_form'));

	$rcmail = rcmail::get_instance();
	$rcmail->output->set_pagetitle($this->gettext('changepasswd'));
	$rcmail->output->send('plugin');
	}

	function password_save()
	{
	$rcmail = rcmail::get_instance();

	$this->add_texts('localization/');
	$this->register_handler('plugin.body', array($this, 'password_form'));
	$rcmail->output->set_pagetitle($this->gettext('changepasswd'));

	$confirm = $rcmail->config->get('password_confirm_current');
	$required_length = intval($rcmail->config->get('password_minimum_length'));
	$check_strength = $rcmail->config->get('password_require_nonalpha');

	if (($confirm && !isset($_POST['_curpasswd'])) \|\| !isset($_POST['_newpasswd'])) {
	$rcmail->output->command('display_message', $this->gettext('nopassword'), 'error');
	}
	else {
	$charset = strtoupper($rcmail->config->get('password_charset', 'ISO-8859-1'));
	$rc_charset = strtoupper($rcmail->output->get_charset());

	$sespwd = $rcmail->decrypt($_SESSION['password']);
	$curpwd = $confirm ? rcube_utils::get_input_value('_curpasswd', rcube_utils::INPUT_POST, true, $charset) : $sespwd;
	$newpwd = rcube_utils::get_input_value('_newpasswd', rcube_utils::INPUT_POST, true);
	$conpwd = rcube_utils::get_input_value('_confpasswd', rcube_utils::INPUT_POST, true);

	// check allowed characters according to the configured 'password_charset' option
	// by converting the password entered by the user to this charset and back to UTF-8
	$orig_pwd = $newpwd;
	$chk_pwd = rcube_charset::convert($orig_pwd, $rc_charset, $charset);
	$chk_pwd = rcube_charset::convert($chk_pwd, $charset, $rc_charset);

	// WARNING: Default password_charset is ISO-8859-1, so conversion will
	// change national characters. This may disable possibility of using
	// the same password in other MUA's.
	// We're doing this for consistence with Roundcube core
	$newpwd = rcube_charset::convert($newpwd, $rc_charset, $charset);
	$conpwd = rcube_charset::convert($conpwd, $rc_charset, $charset);

	if ($chk_pwd != $orig_pwd) {
	$rcmail->output->command('display_message', $this->gettext('passwordforbidden'), 'error');
	}
	// other passwords validity checks
	else if ($conpwd != $newpwd) {
	$rcmail->output->command('display_message', $this->gettext('passwordinconsistency'), 'error');
	}
	else if ($confirm && $sespwd != $curpwd) {
	$rcmail->output->command('display_message', $this->gettext('passwordincorrect'), 'error');
	}
	else if ($required_length && strlen($newpwd) < $required_length) {
	$rcmail->output->command('display_message', $this->gettext(
	array('name' => 'passwordshort', 'vars' => array('length' => $required_length))), 'error');
	}
	else if ($check_strength && (!preg_match("/[0-9]/", $newpwd) \|\| !preg_match("/[^A-Za-z0-9]/", $newpwd))) {
	$rcmail->output->command('display_message', $this->gettext('passwordweak'), 'error');
	}
	// password is the same as the old one, do nothing, return success
	else if ($sespwd == $newpwd && !$rcmail->config->get('password_force_save')) {
	$rcmail->output->command('display_message', $this->gettext('successfullysaved'), 'confirmation');
	}
	// try to save the password
	else if (!($res = $this->_save($curpwd, $newpwd))) {
	$rcmail->output->command('display_message', $this->gettext('successfullysaved'), 'confirmation');

	// allow additional actions after password change (e.g. reset some backends)
	$plugin = $rcmail->plugins->exec_hook('password_change', array(
	'old_pass' => $curpwd, 'new_pass' => $newpwd));

	// Reset session password
	$_SESSION['password'] = $rcmail->encrypt($plugin['new_pass']);

	// Log password change
	if ($rcmail->config->get('password_log')) {
	rcube::write_log('password', sprintf('Password changed for user %s (ID: %d) from %s',
	$rcmail->get_user_name(), $rcmail->user->ID, rcube_utils::remote_ip()));
	}
	}
	else {
	$rcmail->output->command('display_message', $res, 'error');
	}
	}

	$rcmail->overwrite_action('plugin.password');
	$rcmail->output->send('plugin');
	}

	function password_form()
	{
	$rcmail = rcmail::get_instance();

	// add some labels to client
	$rcmail->output->add_label(
	'password.nopassword',
	'password.nocurpassword',
	'password.passwordinconsistency'
	);

	$rcmail->output->set_env('product_name', $rcmail->config->get('product_name'));

	$table = new html_table(array('cols' => 2));

	if ($rcmail->config->get('password_confirm_current')) {
	// show current password selection
	$field_id = 'curpasswd';
	$input_curpasswd = new html_passwordfield(array('name' => '_curpasswd', 'id' => $field_id,
	'size' => 20, 'autocomplete' => 'off'));

	$table->add('title', html::label($field_id, rcube::Q($this->gettext('curpasswd'))));
	$table->add(null, $input_curpasswd->show());
	}

	// show new password selection
	$field_id = 'newpasswd';
	$input_newpasswd = new html_passwordfield(array('name' => '_newpasswd', 'id' => $field_id,
	'size' => 20, 'autocomplete' => 'off'));

	$table->add('title', html::label($field_id, rcube::Q($this->gettext('newpasswd'))));
	$table->add(null, $input_newpasswd->show());

	// show confirm password selection
	$field_id = 'confpasswd';
	$input_confpasswd = new html_passwordfield(array('name' => '_confpasswd', 'id' => $field_id,
	'size' => 20, 'autocomplete' => 'off'));

	$table->add('title', html::label($field_id, rcube::Q($this->gettext('confpasswd'))));
	$table->add(null, $input_confpasswd->show());

	$out = html::div(array('class' => 'box'),
	html::div(array('id' => 'prefs-title', 'class' => 'boxtitle'), $this->gettext('changepasswd')) .
	html::div(array('class' => 'boxcontent'), $table->show() .
	html::p(null,
	$rcmail->output->button(array(
	'command' => 'plugin.password-save',
	'type' => 'input',
	'class' => 'button mainaction',
	'label' => 'save'
	)))));

	$rcmail->output->add_gui_object('passform', 'password-form');

	return $rcmail->output->form_tag(array(
	'id' => 'password-form',
	'name' => 'password-form',
	'method' => 'post',
	'action' => './?_task=settings&_action=plugin.password-save',
	), $out);
	}

	private function _save($curpass, $passwd)
	{
	$config = rcmail::get_instance()->config;
	$driver = $config->get('password_driver', 'sql');
	$class = "rcube_{$driver}_password";
	$file = $this->home . "/drivers/$driver.php";

	if (!file_exists($file)) {
	rcube::raise_error(array(
	'code' => 600,
	'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Password plugin: Unable to open driver file ($file)"
	), true, false);
	return $this->gettext('internalerror');
	}

	include_once $file;

	if (!class_exists($class, false) \|\| !method_exists($class, 'save')) {
	rcube::raise_error(array(
	'code' => 600,
	'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Password plugin: Broken driver $driver"
	), true, false);
	return $this->gettext('internalerror');
	}

	$object = new $class;
	$result = $object->save($curpass, $passwd);

	if (is_array($result)) {
	$message = $result['message'];
	$result = $result['code'];
	}

	switch ($result) {
	case PASSWORD_SUCCESS:
	return;
	case PASSWORD_CRYPT_ERROR;
	$reason = $this->gettext('crypterror');
	break;
	case PASSWORD_CONNECT_ERROR;
	$reason = $this->gettext('connecterror');
	break;
	case PASSWORD_ERROR:
	default:
	$reason = $this->gettext('internalerror');
	}

	if ($message) {
	$reason .= ' ' . $message;
	}

	return $reason;
	}
	}
	diff --git a/plugins/show_additional_headers/package.xml b/plugins/show_additional_headers/package.xml
	index 7297916c3..9ca60baa9 100644
	--- a/plugins/show_additional_headers/package.xml
	+++ b/plugins/show_additional_headers/package.xml
	@@ -1,49 +1,49 @@
	<?xml version="1.0" encoding="UTF-8"?>
	<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
	http://pear.php.net/dtd/tasks-1.0.xsd
	http://pear.php.net/dtd/package-2.0
	http://pear.php.net/dtd/package-2.0.xsd">
	<name>show_additional_headers</name>
	<channel>pear.roundcube.net</channel>
	<summary>Displays additional message headers</summary>
	<description>
	Proof-of-concept plugin which will fetch additional headers and display them in the message view.
	</description>
	<lead>
	<name>Thomas Bruederli</name>
	<user>thomasb</user>
	<email>roundcube@gmail.com</email>
	<active>yes</active>
	</lead>
	<date>2012-04-23</date>
	<version>
	<release>2.0</release>
	<api>2.0</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	- <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	+ <license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
	<notes>-</notes>
	<contents>
	<dir baseinstalldir="/" name="/">
	<file name="show_additional_headers.php" role="php">
	<tasks:replace from="@name@" to="name" type="package-info"/>
	<tasks:replace from="@package_version@" to="version" type="package-info"/>
	</file>
	</dir>
	<!-- / -->
	</contents>
	<dependencies>
	<required>
	<php>
	<min>5.2.1</min>
	</php>
	<pearinstaller>
	<min>1.7.0</min>
	</pearinstaller>
	</required>
	</dependencies>
	<phprelease/>
	</package>
	diff --git a/plugins/show_additional_headers/show_additional_headers.php b/plugins/show_additional_headers/show_additional_headers.php
	index 1375348c2..dcc384be8 100644
	--- a/plugins/show_additional_headers/show_additional_headers.php
	+++ b/plugins/show_additional_headers/show_additional_headers.php
	@@ -1,51 +1,51 @@
	<?php

	/**
	* Show additional message headers
	*
	* Proof-of-concept plugin which will fetch additional headers
	* and display them in the message view.
	*
	* Enable the plugin in config/main.inc.php and add your desired headers:
	* $rcmail_config['show_additional_headers'] = array('User-Agent');
	*
	* @version @package_version@
	* @author Thomas Bruederli
	- * @website http://roundcube.net
	+ * @license GNU GPLv3+
	*/
	class show_additional_headers extends rcube_plugin
	{
	public $task = 'mail';

	function init()
	{
	$rcmail = rcmail::get_instance();
	if ($rcmail->action == 'show' \|\| $rcmail->action == 'preview') {
	$this->add_hook('storage_init', array($this, 'storage_init'));
	$this->add_hook('message_headers_output', array($this, 'message_headers'));
	} else if ($rcmail->action == '') {
	// with enabled_caching we're fetching additional headers before show/preview
	$this->add_hook('storage_init', array($this, 'storage_init'));
	}
	}

	function storage_init($p)
	{
	$rcmail = rcmail::get_instance();
	if ($add_headers = (array)$rcmail->config->get('show_additional_headers', array()))
	$p['fetch_headers'] = trim($p['fetch_headers'].' ' . strtoupper(join(' ', $add_headers)));

	return $p;
	}

	function message_headers($p)
	{
	$rcmail = rcmail::get_instance();
	foreach ((array)$rcmail->config->get('show_additional_headers', array()) as $header) {
	if ($value = $p['headers']->get($header))
	$p['output'][$header] = array('title' => $header, 'value' => $value);
	}

	return $p;
	}
	}
	diff --git a/plugins/subscriptions_option/package.xml b/plugins/subscriptions_option/package.xml
	index 79d44f8c2..04f2c1b3c 100644
	--- a/plugins/subscriptions_option/package.xml
	+++ b/plugins/subscriptions_option/package.xml
	@@ -1,69 +1,69 @@
	<?xml version="1.0" encoding="UTF-8"?>
	<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
	http://pear.php.net/dtd/tasks-1.0.xsd
	http://pear.php.net/dtd/package-2.0
	http://pear.php.net/dtd/package-2.0.xsd">
	<name>subscriptions_option</name>
	<channel>pear.roundcube.net</channel>
	<summary>Option to disable IMAP subscriptions</summary>
	<description>
	A plugin which can enable or disable the use of imap subscriptions.
	It includes a toggle on the settings page under "Server Settings".
	The preference can also be locked.
	</description>
	<lead>
	<name>Thomas Bruederli</name>
	<user>thomasb</user>
	<email>roundcube@gmail.com</email>
	<active>yes</active>
	</lead>
	<developer>
	<name>Ziba Scott</name>
	<user>ziba</user>
	<email>ziba@umich.edu</email>
	<active>yes</active>
	</developer>
	<date>2012-05-21</date>
	<version>
	<release>1.3</release>
	<api>1.1</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	- <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	+ <license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
	<notes>-</notes>
	<contents>
	<dir baseinstalldir="/" name="/">
	<file name="subscriptions_option.php" role="php">
	<tasks:replace from="@name@" to="name" type="package-info"/>
	<tasks:replace from="@package_version@" to="version" type="package-info"/>
	</file>
	<file name="localization/cs_CZ.inc" role="data"></file>
	<file name="localization/de_CH.inc" role="data"></file>
	<file name="localization/de_DE.inc" role="data"></file>
	<file name="localization/en_US.inc" role="data"></file>
	<file name="localization/es_ES.inc" role="data"></file>
	<file name="localization/et_EE.inc" role="data"></file>
	<file name="localization/gl_ES.inc" role="data"></file>
	<file name="localization/ja_JP.inc" role="data"></file>
	<file name="localization/pl_PL.inc" role="data"></file>
	<file name="localization/ru_RU.inc" role="data"></file>
	<file name="localization/sv_SE.inc" role="data"></file>
	<file name="localization/zh_TW.inc" role="data"></file>
	</dir>
	<!-- / -->
	</contents>
	<dependencies>
	<required>
	<php>
	<min>5.2.1</min>
	</php>
	<pearinstaller>
	<min>1.7.0</min>
	</pearinstaller>
	</required>
	</dependencies>
	<phprelease/>
	</package>
	diff --git a/plugins/subscriptions_option/subscriptions_option.php b/plugins/subscriptions_option/subscriptions_option.php
	index 7678d8e94..49adc377b 100644
	--- a/plugins/subscriptions_option/subscriptions_option.php
	+++ b/plugins/subscriptions_option/subscriptions_option.php
	@@ -1,92 +1,93 @@
	<?php

	/**
	* Subscription Options
	*
	* A plugin which can enable or disable the use of imap subscriptions.
	* It includes a toggle on the settings page under "Server Settings".
	* The preference can also be locked
	*
	* Add it to the plugins list in config/main.inc.php to enable the user option
	* The user option can be hidden and set globally by adding 'use_subscriptions'
	* to the 'dont_override' configure line:
	* $rcmail_config['dont_override'] = array('use_subscriptions');
	* and then set the global preference
	* $rcmail_config['use_subscriptions'] = true; // or false
	*
	* Roundcube caches folder lists. When a user changes this option or visits
	* their folder list, this cache is refreshed. If the option is on the
	* 'dont_override' list and the global option has changed, don't expect
	* to see the change until the folder list cache is refreshed.
	*
	* @version @package_version@
	* @author Ziba Scott
	+ * @license GNU GPLv3+
	*/
	class subscriptions_option extends rcube_plugin
	{
	public $task = 'mail\|settings';

	function init()
	{
	$this->add_texts('localization/', false);
	$dont_override = rcmail::get_instance()->config->get('dont_override', array());
	if (!in_array('use_subscriptions', $dont_override)) {
	$this->add_hook('preferences_list', array($this, 'settings_blocks'));
	$this->add_hook('preferences_save', array($this, 'save_prefs'));
	}
	$this->add_hook('storage_folders', array($this, 'mailboxes_list'));
	$this->add_hook('folders_list', array($this, 'folders_list'));
	}

	function settings_blocks($args)
	{
	if ($args['section'] == 'server') {
	$use_subscriptions = rcmail::get_instance()->config->get('use_subscriptions');
	$field_id = 'rcmfd_use_subscriptions';
	$checkbox = new html_checkbox(array('name' => '_use_subscriptions', 'id' => $field_id, 'value' => 1));

	$args['blocks']['main']['options']['use_subscriptions'] = array(
	'title' => html::label($field_id, rcube::Q($this->gettext('useimapsubscriptions'))),
	'content' => $checkbox->show($use_subscriptions?1:0),
	);
	}

	return $args;
	}

	function save_prefs($args)
	{
	if ($args['section'] == 'server') {
	$rcmail = rcmail::get_instance();
	$use_subscriptions = $rcmail->config->get('use_subscriptions');

	$args['prefs']['use_subscriptions'] = isset($_POST['_use_subscriptions']) ? true : false;

	// if the use_subscriptions preference changes, flush the folder cache
	if (($use_subscriptions && !isset($_POST['_use_subscriptions'])) \|\|
	(!$use_subscriptions && isset($_POST['_use_subscriptions']))) {
	$storage = $rcmail->get_storage();
	$storage->clear_cache('mailboxes');
	}
	}
	return $args;
	}

	function mailboxes_list($args)
	{
	$rcmail = rcmail::get_instance();
	if (!$rcmail->config->get('use_subscriptions', true)) {
	$args['folders'] = $rcmail->get_storage()->list_folders_direct();
	}
	return $args;
	}

	function folders_list($args)
	{
	$rcmail = rcmail::get_instance();
	if (!$rcmail->config->get('use_subscriptions', true)) {
	$args['table']->remove_column('subscribed');
	}
	return $args;
	}
	}
	diff --git a/plugins/virtuser_query/package.xml b/plugins/virtuser_query/package.xml
	index b7ea565d8..9430bf69d 100644
	--- a/plugins/virtuser_query/package.xml
	+++ b/plugins/virtuser_query/package.xml
	@@ -1,47 +1,47 @@
	<?xml version="1.0" encoding="UTF-8"?>
	<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
	http://pear.php.net/dtd/tasks-1.0.xsd
	http://pear.php.net/dtd/package-2.0
	http://pear.php.net/dtd/package-2.0.xsd">
	<name>virtuser_query</name>
	<channel>pear.roundcube.net</channel>
	<summary>SQL based User-to-Email and Email-to-User lookup</summary>
	<description>Plugin adds possibility to resolve user email/login according to lookup tables in SQL database.</description>
	<lead>
	<name>Aleksander Machniak</name>
	<user>alec</user>
	<email>alec@alec.pl</email>
	<active>yes</active>
	</lead>
	<date>2012-02-17</date>
	<version>
	<release>2.0</release>
	<api>2.0</api>
	</version>
	<stability>
	<release>stable</release>
	<api>stable</api>
	</stability>
	- <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
	+ <license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
	<notes>-</notes>
	<contents>
	<dir baseinstalldir="/" name="/">
	<file name="virtuser_query.php" role="php">
	<tasks:replace from="@name@" to="name" type="package-info"/>
	<tasks:replace from="@package_version@" to="version" type="package-info"/>
	</file>
	</dir>
	<!-- / -->
	</contents>
	<dependencies>
	<required>
	<php>
	<min>5.2.1</min>
	</php>
	<pearinstaller>
	<min>1.7.0</min>
	</pearinstaller>
	</required>
	</dependencies>
	<phprelease/>
	</package>
	diff --git a/plugins/virtuser_query/virtuser_query.php b/plugins/virtuser_query/virtuser_query.php
	index 9e3dc9071..db3c5197b 100644
	--- a/plugins/virtuser_query/virtuser_query.php
	+++ b/plugins/virtuser_query/virtuser_query.php
	@@ -1,145 +1,146 @@
	<?php

	/**
	* DB based User-to-Email and Email-to-User lookup
	*
	* Add it to the plugins list in config/main.inc.php and set
	* SQL queries to resolve usernames, e-mail addresses and hostnames from the database
	* %u will be replaced with the current username for login.
	* %m will be replaced with the current e-mail address for login.
	*
	* Queries should select the user's e-mail address, username or the imap hostname as first column
	* The email query could optionally select identity data columns in specified order:
	* name, organization, reply-to, bcc, signature, html_signature
	*
	* $rcmail_config['virtuser_query'] = array('email' => '', 'user' => '', 'host' => '');
	*
	* The email query can return more than one record to create more identities.
	* This requires identities_level option to be set to value less than 2.
	*
	* By default Roundcube database is used. To use different database (or host)
	* you can specify DSN string in $rcmail_config['virtuser_query_dsn'] option.
	*
	* @version @package_version@
	* @author Aleksander Machniak <alec@alec.pl>
	* @author Steffen Vogel
	+ * @license GNU GPLv3+
	*/
	class virtuser_query extends rcube_plugin
	{
	private $config;
	private $app;
	private $db;

	function init()
	{
	$this->app = rcmail::get_instance();
	$this->config = $this->app->config->get('virtuser_query');

	if (!empty($this->config)) {
	if (is_string($this->config)) {
	$this->config = array('email' => $this->config);
	}

	if ($this->config['email']) {
	$this->add_hook('user2email', array($this, 'user2email'));
	}
	if ($this->config['user']) {
	$this->add_hook('email2user', array($this, 'email2user'));
	}
	if ($this->config['host']) {
	$this->add_hook('authenticate', array($this, 'user2host'));
	}
	}
	}

	/**
	* User > Email
	*/
	function user2email($p)
	{
	$dbh = $this->get_dbh();

	$sql_result = $dbh->query(preg_replace('/%u/', $dbh->escape($p['user']), $this->config['email']));

	while ($sql_arr = $dbh->fetch_array($sql_result)) {
	if (strpos($sql_arr[0], '@')) {
	if ($p['extended'] && count($sql_arr) > 1) {
	$result[] = array(
	'email' => rcube_utils::idn_to_ascii($sql_arr[0]),
	'name' => $sql_arr[1],
	'organization' => $sql_arr[2],
	'reply-to' => rcube_utils::idn_to_ascii($sql_arr[3]),
	'bcc' => rcube_utils::idn_to_ascii($sql_arr[4]),
	'signature' => $sql_arr[5],
	'html_signature' => (int)$sql_arr[6],
	);
	}
	else {
	$result[] = $sql_arr[0];
	}

	if ($p['first']) {
	break;
	}
	}
	}

	$p['email'] = $result;

	return $p;
	}

	/**
	* EMail > User
	*/
	function email2user($p)
	{
	$dbh = $this->get_dbh();

	$sql_result = $dbh->query(preg_replace('/%m/', $dbh->escape($p['email']), $this->config['user']));

	if ($sql_arr = $dbh->fetch_array($sql_result)) {
	$p['user'] = $sql_arr[0];
	}

	return $p;
	}

	/**
	* User > Host
	*/
	function user2host($p)
	{
	$dbh = $this->get_dbh();

	$sql_result = $dbh->query(preg_replace('/%u/', $dbh->escape($p['user']), $this->config['host']));

	if ($sql_arr = $dbh->fetch_array($sql_result)) {
	$p['host'] = $sql_arr[0];
	}

	return $p;
	}

	/**
	* Initialize database handler
	*/
	function get_dbh()
	{
	if (!$this->db) {
	if ($dsn = $this->app->config->get('virtuser_query_dsn')) {
	// connect to the virtuser database
	$this->db = rcube_db::factory($dsn);
	$this->db->set_debug((bool)$this->app->config->get('sql_debug'));
	$this->db->db_connect('r'); // connect in read mode
	}
	else {
	$this->db = $this->app->get_dbh();
	}
	}

	return $this->db;
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Fri, Feb 6, 1:38 AM (8 h, 31 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 428030
Default Alt Text: (306 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions