No OneTemporary
Actions

Size

161 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js
	index 364765047..1b92ed86d 100644
	--- a/plugins/acl/acl.js
	+++ b/plugins/acl/acl.js
	@@ -1,392 +1,389 @@
	/**
	* ACL plugin script
	- *
	- * @version @package_version@
	- * @author Aleksander Machniak <alec@alec.pl>
	*/

	if (window.rcmail) {
	rcmail.addEventListener('init', function() {
	if (rcmail.gui_objects.acltable) {
	rcmail.acl_list_init();
	// enable autocomplete on user input
	if (rcmail.env.acl_users_source) {
	var inst = rcmail.is_framed() ? parent.rcmail : rcmail;
	inst.init_address_input_events($('#acluser'), {action:'settings/plugin.acl-autocomplete'});

	// pass config settings and localized texts to autocomplete context
	inst.set_env({ autocomplete_max:rcmail.env.autocomplete_max, autocomplete_min_length:rcmail.env.autocomplete_min_length });
	inst.add_label('autocompletechars', rcmail.labels.autocompletechars);
	inst.add_label('autocompletemore', rcmail.labels.autocompletemore);

	// fix inserted value
	inst.addEventListener('autocomplete_insert', function(e) {
	if (e.field.id != 'acluser')
	return;

	e.field.value = e.insert.replace(/[ ,;]+$/, '');
	});
	}
	}

	rcmail.enable_command('acl-create', 'acl-save', 'acl-cancel', 'acl-mode-switch', true);
	rcmail.enable_command('acl-delete', 'acl-edit', false);

	if (rcmail.env.acl_advanced)
	$('#acl-switch').addClass('selected');
	});
	}

	// Display new-entry form
	rcube_webmail.prototype.acl_create = function()
	{
	this.acl_init_form();
	}

	// Display ACL edit form
	rcube_webmail.prototype.acl_edit = function()
	{
	// @TODO: multi-row edition
	var id = this.acl_list.get_single_selection();
	if (id)
	this.acl_init_form(id);
	}

	// ACL entry delete
	rcube_webmail.prototype.acl_delete = function()
	{
	var users = this.acl_get_usernames();

	if (users && users.length && confirm(this.get_label('acl.deleteconfirm'))) {
	this.http_post('settings/plugin.acl', {
	_act: 'delete',
	_user: users.join(','),
	_mbox: this.env.mailbox
	},
	this.set_busy(true, 'acl.deleting'));
	}
	}

	// Save ACL data
	rcube_webmail.prototype.acl_save = function()
	{
	var data, type, rights = '', user = $('#acluser', this.acl_form).val();

	$((this.env.acl_advanced ? '#advancedrights :checkbox' : '#simplerights :checkbox'), this.acl_form).map(function() {
	if (this.checked)
	rights += this.value;
	});

	if (type = $('input:checked[name=usertype]', this.acl_form).val()) {
	if (type != 'user')
	user = type;
	}

	if (!user) {
	alert(this.get_label('acl.nouser'));
	return;
	}
	if (!rights) {
	alert(this.get_label('acl.norights'));
	return;
	}

	data = {
	_act: 'save',
	_user: user,
	_acl: rights,
	_mbox: this.env.mailbox
	}

	if (this.acl_id) {
	data._old = this.acl_id;
	}

	this.http_post('settings/plugin.acl', data, this.set_busy(true, 'acl.saving'));
	}

	// Cancel/Hide form
	rcube_webmail.prototype.acl_cancel = function()
	{
	this.ksearch_blur();
	this.acl_popup.dialog('close');
	}

	// Update data after save (and hide form)
	rcube_webmail.prototype.acl_update = function(o)
	{
	// delete old row
	if (o.old)
	this.acl_remove_row(o.old);
	// make sure the same ID doesn't exist
	else if (this.env.acl[o.id])
	this.acl_remove_row(o.id);

	// add new row
	this.acl_add_row(o, true);
	// hide autocomplete popup
	this.ksearch_blur();
	// hide form
	this.acl_popup.dialog('close');
	}

	// Switch table display mode
	rcube_webmail.prototype.acl_mode_switch = function(elem)
	{
	this.env.acl_advanced = !this.env.acl_advanced;
	this.enable_command('acl-delete', 'acl-edit', false);
	this.http_request('settings/plugin.acl', '_act=list'
	+ '&_mode='+(this.env.acl_advanced ? 'advanced' : 'simple')
	+ '&_mbox='+urlencode(this.env.mailbox),
	this.set_busy(true, 'loading'));
	}

	// ACL table initialization
	rcube_webmail.prototype.acl_list_init = function()
	{
	var method = this.env.acl_advanced ? 'addClass' : 'removeClass';

	$('#acl-switch')[method]('selected');
	$(this.gui_objects.acltable)[method]('advanced');

	this.acl_list = new rcube_list_widget(this.gui_objects.acltable,
	{multiselect: true, draggable: false, keyboard: true});
	this.acl_list.addEventListener('select', function(o) { rcmail.acl_list_select(o); })
	.addEventListener('dblclick', function(o) { rcmail.acl_list_dblclick(o); })
	.addEventListener('keypress', function(o) { rcmail.acl_list_keypress(o); })
	.init();
	}

	// ACL table row selection handler
	rcube_webmail.prototype.acl_list_select = function(list)
	{
	rcmail.enable_command('acl-delete', list.selection.length > 0);
	rcmail.enable_command('acl-edit', list.selection.length == 1);
	list.focus();
	}

	// ACL table double-click handler
	rcube_webmail.prototype.acl_list_dblclick = function(list)
	{
	this.acl_edit();
	}

	// ACL table keypress handler
	rcube_webmail.prototype.acl_list_keypress = function(list)
	{
	if (list.key_pressed == list.ENTER_KEY)
	this.command('acl-edit');
	else if (list.key_pressed == list.DELETE_KEY \|\| list.key_pressed == list.BACKSPACE_KEY)
	if (!this.acl_form \|\| !this.acl_form.is(':visible'))
	this.command('acl-delete');
	}

	// Reloads ACL table
	rcube_webmail.prototype.acl_list_update = function(html)
	{
	$(this.gui_objects.acltable).html(html);
	this.acl_list_init();
	}

	// Returns names of users in selected rows
	rcube_webmail.prototype.acl_get_usernames = function()
	{
	var users = [], n, len, cell, row,
	list = this.acl_list,
	selection = list.get_selection();

	for (n=0, len=selection.length; n<len; n++) {
	if (this.env.acl_specials.length && $.inArray(selection[n], this.env.acl_specials) >= 0) {
	users.push(selection[n]);
	}
	else if (row = list.rows[selection[n]]) {
	cell = $('td.user', row.obj);
	if (cell.length == 1)
	users.push(cell.text());
	}
	}

	return users;
	}

	// Removes ACL table row
	rcube_webmail.prototype.acl_remove_row = function(id)
	{
	var list = this.acl_list;

	list.remove_row(id);
	list.clear_selection();

	// we don't need it anymore (remove id conflict)
	$('#rcmrow'+id).remove();
	this.env.acl[id] = null;

	this.enable_command('acl-delete', list.selection.length > 0);
	this.enable_command('acl-edit', list.selection.length == 1);
	}

	// Adds ACL table row
	rcube_webmail.prototype.acl_add_row = function(o, sel)
	{
	var n, len, ids = [], spec = [], id = o.id, list = this.acl_list,
	items = this.env.acl_advanced ? [] : this.env.acl_items,
	table = this.gui_objects.acltable,
	row = $('thead > tr', table).clone();

	// Update new row
	$('th', row).map(function() {
	var td = $('<td>'),
	title = $(this).attr('title'),
	cl = this.className.replace(/^acl/, '');

	if (title)
	td.attr('title', title);

	if (items && items[cl])
	cl = items[cl];

	if (cl == 'user')
	td.addClass(cl).append($('<a>').text(o.username));
	else
	td.addClass(this.className + ' ' + rcmail.acl_class(o.acl, cl)).text('');

	$(this).replaceWith(td);
	});

	row.attr('id', 'rcmrow'+id);
	row = row.get(0);

	this.env.acl[id] = o.acl;

	// sorting... (create an array of user identifiers, then sort it)
	for (n in this.env.acl) {
	if (this.env.acl[n]) {
	if (this.env.acl_specials.length && $.inArray(n, this.env.acl_specials) >= 0)
	spec.push(n);
	else
	ids.push(n);
	}
	}
	ids.sort();
	// specials on the top
	ids = spec.concat(ids);

	// find current id
	for (n=0, len=ids.length; n<len; n++)
	if (ids[n] == id)
	break;

	// add row
	if (n && n < len) {
	$('#rcmrow'+ids[n-1]).after(row);
	list.init_row(row);
	list.rowcount++;
	}
	else
	list.insert_row(row);

	if (sel)
	list.select_row(o.id);
	}

	// Initializes and shows ACL create/edit form
	rcube_webmail.prototype.acl_init_form = function(id)
	{
	var ul, row, td, val = '', type = 'user', li_elements, body = $('body'),
	adv_ul = $('#advancedrights'), sim_ul = $('#simplerights'),
	name_input = $('#acluser'), type_list = $('#usertype');

	if (!this.acl_form) {
	var fn = function () { $('input[value="user"]').prop('checked', true); };
	name_input.click(fn).keypress(fn);
	}

	this.acl_form = $('#aclform');

	// Hide unused items
	if (this.env.acl_advanced) {
	adv_ul.show();
	sim_ul.hide();
	ul = adv_ul;
	}
	else {
	sim_ul.show();
	adv_ul.hide();
	ul = sim_ul;
	}

	// initialize form fields
	li_elements = $(':checkbox', ul);
	li_elements.attr('checked', false);

	if (id && (row = this.acl_list.rows[id])) {
	row = row.obj;
	li_elements.map(function() {
	td = $('td.'+this.id, row);
	if (td.length && td.hasClass('enabled'))
	this.checked = true;
	});

	if (!this.env.acl_specials.length \|\| $.inArray(id, this.env.acl_specials) < 0)
	val = $('td.user', row).text();
	else
	type = id;
	}
	// mark read (lrs) rights by default
	else {
	li_elements.filter(function() { return this.id.match(/^acl([lrs]\|read)$/); }).prop('checked', true);
	}

	name_input.val(val);
	$('input[value='+type+']').prop('checked', true);

	this.acl_id = id;

	var buttons = {}, me = this, body = document.body;

	buttons[this.get_label('save')] = function(e) { me.command('acl-save'); };
	buttons[this.get_label('cancel')] = function(e) { me.command('acl-cancel'); };

	// display it as popup
	this.acl_popup = this.show_popup_dialog(
	this.acl_form.show(),
	id ? this.get_label('acl.editperms') : this.get_label('acl.newuser'),
	buttons,
	{
	button_classes: ['mainaction'],
	modal: true,
	closeOnEscape: true,
	close: function(e, ui) {
	(me.is_framed() ? parent.rcmail : me).ksearch_hide();
	me.acl_form.appendTo(body).hide();
	$(this).remove();
	window.focus(); // focus iframe
	}
	}
	);

	if (type == 'user')
	name_input.focus();
	else
	$('input:checked', type_list).focus();
	}

	// Returns class name according to ACL comparision result
	rcube_webmail.prototype.acl_class = function(acl1, acl2)
	{
	var i, len, found = 0;

	acl1 = String(acl1);
	acl2 = String(acl2);

	for (i=0, len=acl2.length; i<len; i++)
	if (acl1.indexOf(acl2[i]) > -1)
	found++;

	if (found == len)
	return 'enabled';
	else if (found)
	return 'partial';

	return 'disabled';
	}
	diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
	index 30b5da99f..9896d7a13 100644
	--- a/plugins/acl/acl.php
	+++ b/plugins/acl/acl.php
	@@ -1,782 +1,781 @@
	<?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 as published by
	* the Free Software Foundation, either version 3 of the License, or
	* (at your option) any later version.
	*
	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.
	*
	* You should have received a copy of the GNU General Public License
	* along with this program. If not, see http://www.gnu.org/licenses/.
	*/

	class 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);
	$reqid = rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC);
	$users = array();
	$keys = 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) {
	$display = rcube_addressbook::compose_search_name($record);
	$user = array('name' => $user, 'display' => $display);
	$users[] = $user;
	$keys[] = $display ?: $user['name'];
	}
	}

	if ($this->rc->config->get('acl_groups')) {
	$prefix = $this->rc->config->get('acl_group_prefix');
	$group_field = $this->rc->config->get('acl_group_field', 'name');
	$result = $this->ldap->list_groups($search, $mode);

	foreach ($result as $record) {
	$group = $record['name'];
	$group_id = is_array($record[$group_field]) ? $record[$group_field][0] : $record[$group_field];

	if ($group) {
	$users[] = array('name' => ($prefix ?: '') . $group_id, 'display' => $group, 'type' => 'group');
	$keys[] = $group;
	}
	}
	}
	}

	if (count($users)) {
	// sort users index
	asort($keys, SORT_LOCALE_STRING);
	// re-sort users according to index
	foreach ($keys as $idx => $val) {
	$keys[$idx] = $users[$idx];
	}
	$users = array_values($keys);
	}

	$this->rc->output->command('ksearch_query_results', $users, $search, $reqid);
	$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', 'newuser', 'editperms'));
	$this->rc->output->add_label('save', 'cancel');
	$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();

	// give plugins the opportunity to adjust this list
	$data = $this->rc->plugins->exec_hook('acl_rights_supported',
	array('rights' => $supported, 'folder' => $this->mbox, 'labels' => array()));
	$supported = $data['rights'];

	// 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)),
	);

	// give plugins the opportunity to adjust this list
	$data = $this->rc->plugins->exec_hook('acl_rights_simple',
	array('rights' => $items, 'folder' => $this->mbox, 'labels' => array(), 'titles' => array()));

	foreach ($data['rights'] 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' => $data['titles'][$key] ?: $this->gettext('longacl'.$key)),
	$data['labels'][$key] ?: $this->gettext('acl'.$key)));
	}

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

	$this->rc->output->set_env('acl_items', $data['rights']);

	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' => $attrib['id']), $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', 'class' => $attrib['class']), $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();

	// give plugins the opportunity to adjust this list
	$data = $this->rc->plugins->exec_hook('acl_rights_supported',
	array('rights' => $supported, 'folder' => $this->mbox, 'labels' => array()));
	$supported = $data['rights'];

	// 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)),
	);

	// give plugins the opportunity to adjust this list
	$data = $this->rc->plugins->exec_hook('acl_rights_simple',
	array('rights' => $items, 'folder' => $this->mbox, 'labels' => array()));
	$items = $data['rights'];
	}

	// 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 = $data['labels'][$key] ?: $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', html::a(array('id' => 'rcmlinkrow'.$userid), 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_POST, true)); // UTF7-IMAP
	$user = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_POST));
	$acl = trim(rcube_utils::get_input_value('_acl', rcube_utils::INPUT_POST));
	$oldid = trim(rcube_utils::get_input_value('_old', rcube_utils::INPUT_POST));

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

	foreach ($users as $user) {
	$user = trim($user);
	$prefix = $this->rc->config->get('acl_groups') ? $this->rc->config->get('acl_group_prefix') : '';

	if ($prefix && strpos($user, $prefix) === 0) {
	$username = $user;
	}
	else 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_POST, true)); //UTF7-IMAP
	$user = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_POST));

	$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';

	// 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']['name'] = $name_field;
	$config['fieldmap']['uid'] = $uid_field;

	// search in UID and name fields
	// $name_field can be in a form of <field>:<modifier> (#1490591)
	$name_field = preg_replace('/:.*$/', '', $name_field);
	$search = array_unique(array($name_field, $uid_field));

	$config['search_fields'] = $search;
	$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/additional_message_headers/additional_message_headers.php b/plugins/additional_message_headers/additional_message_headers.php
	index 58e4d4148..4db93ee69 100644
	--- a/plugins/additional_message_headers/additional_message_headers.php
	+++ b/plugins/additional_message_headers/additional_message_headers.php
	@@ -1,38 +1,37 @@
	<?php

	/**
	* Additional Message Headers
	*
	* Very simple plugin which will add additional headers
	* to or remove them from outgoing messages.
	*
	* Enable the plugin in config.inc.php and add your desired headers:
	* $config['additional_message_headers'] = array('User-Agent' => 'My-Very-Own-Webmail');
	*
	- * @version @package_version@
	* @author Ziba Scott
	* @website http://roundcube.net
	*/
	class additional_message_headers extends rcube_plugin
	{
	function init()
	{
	$this->add_hook('message_before_send', array($this, 'message_headers'));
	}

	function message_headers($args)
	{
	$this->load_config();

	$rcube = rcube::get_instance();

	// additional email headers
	$additional_headers = $rcube->config->get('additional_message_headers', array());

	if (!empty($additional_headers)) {
	$args['message']->headers($additional_headers, true);
	}

	return $args;
	}
	}
	diff --git a/plugins/attachment_reminder/attachment_reminder.php b/plugins/attachment_reminder/attachment_reminder.php
	index 84cc5f3b3..74df25f61 100644
	--- a/plugins/attachment_reminder/attachment_reminder.php
	+++ b/plugins/attachment_reminder/attachment_reminder.php
	@@ -1,84 +1,83 @@
	<?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/>
	*/

	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/database_attachments/database_attachments.php b/plugins/database_attachments/database_attachments.php
	index aacafae4e..91335d4cf 100644
	--- a/plugins/database_attachments/database_attachments.php
	+++ b/plugins/database_attachments/database_attachments.php
	@@ -1,188 +1,187 @@
	<?php

	/**
	* Database Attachments
	*
	* This plugin which provides database backed storage for temporary
	* attachment file handling. The primary advantage of this plugin
	* is its compatibility with round-robin dns multi-server roundcube
	* installations.
	*
	* This plugin relies on the core filesystem_attachments plugin
	*
	* @author Ziba Scott <ziba@umich.edu>
	* @author Aleksander Machniak <alec@alec.pl>
	- * @version @package_version@
	*
	* 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.
	*/

	if (class_exists('filesystem_attachments', false) && !defined('TESTS_DIR')) {
	die("Configuration issue. There can be only one enabled plugin for attachments handling");
	}

	require_once INSTALL_PATH . 'plugins/filesystem_attachments/filesystem_attachments.php';

	class database_attachments extends filesystem_attachments
	{
	// Cache object
	protected $cache;

	// A prefix for the cache key used in the session and in the key field of the cache table
	const PREFIX = "ATTACH";

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

	$cache = $this->get_cache();
	$key = $this->_key($args);
	$data = file_get_contents($args['path']);

	if ($data === false) {
	return $args;
	}

	$data = base64_encode($data);
	$status = $cache->write($key, $data);

	if ($status) {
	$args['id'] = $key;
	$args['status'] = true;
	$args['path'] = null;
	}

	return $args;
	}

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

	$cache = $this->get_cache();
	$key = $this->_key($args);

	if ($args['path']) {
	$args['data'] = file_get_contents($args['path']);

	if ($args['data'] === false) {
	return $args;
	}
	}

	$data = base64_encode($args['data']);
	$status = $cache->write($key, $data);

	if ($status) {
	$args['id'] = $key;
	$args['status'] = true;
	}

	return $args;
	}

	/**
	* Remove an attachment from storage
	* This is triggered by the remove attachment button on the compose screen
	*/
	function remove($args)
	{
	$cache = $this->get_cache();
	$status = $cache->remove($args['id']);

	$args['status'] = true;

	return $args;
	}

	/**
	* When composing an html message, image attachments may be shown
	* For this plugin, $this->get() will check the file and
	* return it's contents
	*/
	function display($args)
	{
	return $this->get($args);
	}

	/**
	* When displaying or sending the attachment the file contents are fetched
	* using this method. This is also called by the attachment_display hook.
	*/
	function get($args)
	{
	$cache = $this->get_cache();
	$data = $cache->read($args['id']);

	if ($data) {
	$args['data'] = base64_decode($data);
	$args['status'] = true;
	}

	return $args;
	}

	/**
	* Delete all temp files associated with this user
	*/
	function cleanup($args)
	{
	// check if cache object exist, it may be empty on session_destroy (#1489726)
	if ($cache = $this->get_cache()) {
	$cache->remove($args['group'], true);
	}
	}

	/**
	* Helper method to generate a unique key for the given attachment file
	*/
	protected function _key($args)
	{
	$uname = $args['path'] ?: $args['name'];
	return $args['group'] . md5(time() . $uname . $_SESSION['user_id']);
	}

	/**
	* Initialize and return cache object
	*/
	protected function get_cache()
	{
	if (!$this->cache) {
	$this->load_config();

	$rcmail = rcube::get_instance();
	$ttl = 12 * 60 * 60; // default: 12 hours
	$ttl = $rcmail->config->get('database_attachments_cache_ttl', $ttl);
	$type = $rcmail->config->get('database_attachments_cache', 'db');
	$prefix = self::PREFIX;

	// Add session identifier to the prefix to prevent from removing attachments
	// in other sessions of the same user (#1490542)
	if ($id = session_id()) {
	$prefix .= $id;
	}

	// Init SQL cache (disable cache data serialization)
	$this->cache = $rcmail->get_cache($prefix, $type, $ttl, false);
	}

	return $this->cache;
	}
	}
	diff --git a/plugins/debug_logger/debug_logger.php b/plugins/debug_logger/debug_logger.php
	index c66b8b6ac..98758ae3c 100644
	--- a/plugins/debug_logger/debug_logger.php
	+++ b/plugins/debug_logger/debug_logger.php
	@@ -1,150 +1,149 @@
	<?php

	/**
	* Debug Logger
	*
	* Enhanced logging for debugging purposes. It is not recommened
	* to be enabled on production systems without testing because of
	* the somewhat increased memory, cpu and disk i/o overhead.
	*
	* Debug Logger listens for existing console("message") calls and
	* introduces start and end tags as well as free form tagging
	* which can redirect messages to files. The resulting log files
	* provide timing and tag quantity results.
	*
	* Enable the plugin in config.inc.php and add your desired
	* log types and files.
	*
	- * @version @package_version@
	* @author Ziba Scott
	* @website http://roundcube.net
	*
	* Example:
	*
	* config.inc.php:
	*
	* // $config['debug_logger'][type of logging] = name of file in log_dir
	* // The 'master' log includes timing information
	* $config['debug_logger']['master'] = 'master';
	* // If you want sql messages to also go into a separate file
	* $config['debug_logger']['sql'] = 'sql';
	*
	* index.php (just after $RCMAIL->plugins->init()):
	*
	* console("my test","start");
	* console("my message");
	* console("my sql calls","start");
	* console("cp -r * /dev/null","shell exec");
	* console("select * from example","sql");
	* console("select * from example","sql");
	* console("select * from example","sql");
	* console("end");
	* console("end");
	*
	*
	* logs/master (after reloading the main page):
	*
	* [17-Feb-2009 16:51:37 -0500] start: Task: mail.
	* [17-Feb-2009 16:51:37 -0500] start: my test
	* [17-Feb-2009 16:51:37 -0500] my message
	* [17-Feb-2009 16:51:37 -0500] shell exec: cp -r * /dev/null
	* [17-Feb-2009 16:51:37 -0500] start: my sql calls
	* [17-Feb-2009 16:51:37 -0500] sql: select * from example
	* [17-Feb-2009 16:51:37 -0500] sql: select * from example
	* [17-Feb-2009 16:51:37 -0500] sql: select * from example
	* [17-Feb-2009 16:51:37 -0500] end: my sql calls - 0.0018 seconds shell exec: 1, sql: 3,
	* [17-Feb-2009 16:51:37 -0500] end: my test - 0.0055 seconds shell exec: 1, sql: 3,
	* [17-Feb-2009 16:51:38 -0500] end: Task: mail. - 0.8854 seconds shell exec: 1, sql: 3,
	*
	* logs/sql (after reloading the main page):
	*
	* [17-Feb-2009 16:51:37 -0500] sql: select * from example
	* [17-Feb-2009 16:51:37 -0500] sql: select * from example
	* [17-Feb-2009 16:51:37 -0500] sql: select * from example
	*/
	class debug_logger extends rcube_plugin
	{
	function init()
	{
	require_once(__DIR__ . '/runlog/runlog.php');
	$this->runlog = new runlog();

	if(!rcmail::get_instance()->config->get('log_dir')){
	rcmail::get_instance()->config->set('log_dir',INSTALL_PATH.'logs');
	}

	$log_config = rcmail::get_instance()->config->get('debug_logger',array());

	foreach($log_config as $type=>$file){
	$this->runlog->set_file(rcmail::get_instance()->config->get('log_dir').'/'.$file, $type);
	}

	$start_string = "";
	$action = rcmail::get_instance()->action;
	$task = rcmail::get_instance()->task;
	if($action){
	$start_string .= "Action: ".$action.". ";
	}
	if($task){
	$start_string .= "Task: ".$task.". ";
	}
	$this->runlog->start($start_string);

	$this->add_hook('console', array($this, 'console'));
	$this->add_hook('authenticate', array($this, 'authenticate'));
	}

	function authenticate($args){
	$this->runlog->note('Authenticating '.$args['user'].'@'.$args['host']);
	return $args;
	}

	function console($args){
	$note = $args[0];
	$type = $args[1];


	if(!isset($args[1])){
	// This could be extended to detect types based on the
	// file which called console. For now only rcube_imap/rcube_storage is supported
	$bt = debug_backtrace();
	$file = $bt[3]['file'];
	switch(basename($file)){
	case 'rcube_imap.php':
	$type = 'imap';
	break;
	case 'rcube_storage.php':
	$type = 'storage';
	break;
	default:
	$type = FALSE;
	break;
	}
	}
	switch($note){
	case 'end':
	$type = 'end';
	break;
	}


	switch($type){
	case 'start':
	$this->runlog->start($note);
	break;
	case 'end':
	$this->runlog->end();
	break;
	default:
	$this->runlog->note($note, $type);
	break;
	}
	return $args;
	}

	function __destruct()
	{
	if ($this->runlog)
	$this->runlog->end();
	}
	}
	diff --git a/plugins/emoticons/emoticons.php b/plugins/emoticons/emoticons.php
	index d5f0e9a16..18c4e149d 100644
	--- a/plugins/emoticons/emoticons.php
	+++ b/plugins/emoticons/emoticons.php
	@@ -1,186 +1,185 @@
	<?php

	/**
	* Emoticons
	*
	* Plugin to replace emoticons in plain text message body with real icons.
	* Also it enables emoticons in HTML compose editor. Both features are optional.
	*
	- * @version @package_version@
	* @license GNU GPLv3+
	* @author Thomas Bruederli
	* @author Aleksander Machniak
	* @website http://roundcube.net
	*/
	class emoticons extends rcube_plugin
	{
	public $task = 'mail\|settings\|utils';


	/**
	* Plugin initilization.
	*/
	function init()
	{
	$rcube = rcube::get_instance();

	$this->add_hook('message_part_after', array($this, 'message_part_after'));
	$this->add_hook('message_outgoing_body', array($this, 'message_outgoing_body'));
	$this->add_hook('html2text', array($this, 'html2text'));
	$this->add_hook('html_editor', array($this, 'html_editor'));

	if ($rcube->task == 'settings') {
	$this->add_hook('preferences_list', array($this, 'preferences_list'));
	$this->add_hook('preferences_save', array($this, 'preferences_save'));
	}
	}

	/**
	* 'message_part_after' hook handler to replace common plain text emoticons
	* with emoticon images (<img>)
	*/
	function message_part_after($args)
	{
	if ($args['type'] == 'plain') {
	$this->load_config();

	$rcube = rcube::get_instance();
	if (!$rcube->config->get('emoticons_display', false)) {
	return $args;
	}

	require_once __DIR__ . '/emoticons_engine.php';

	$args['body'] = emoticons_engine::text2icons($args['body']);
	}

	return $args;
	}

	/**
	* 'message_outgoing_body' hook handler to replace image emoticons from TinyMCE
	* editor with image attachments.
	*/
	function message_outgoing_body($args)
	{
	if ($args['type'] == 'html') {
	$this->load_config();

	$rcube = rcube::get_instance();
	if (!$rcube->config->get('emoticons_compose', true)) {
	return $args;
	}

	require_once __DIR__ . '/emoticons_engine.php';

	// look for "emoticon" images from TinyMCE and change their src paths to
	// be file paths on the server instead of URL paths.
	$images = emoticons_engine::replace($args['body']);

	// add these images as attachments to the MIME message
	foreach ($images as $img_name => $img_file) {
	$args['message']->addHTMLImage($img_file, 'image/gif', '', true, $img_name);
	}
	}

	return $args;
	}

	/**
	* 'html2text' hook handler to replace image emoticons from TinyMCE
	* editor with plain text emoticons.
	*
	* This is executed on html2text action, i.e. when switching from HTML to text
	* in compose window (or similiar place). Also when generating alternative
	* text/plain part.
	*/
	function html2text($args)
	{
	$rcube = rcube::get_instance();

	if ($rcube->action == 'html2text' \|\| $rcube->action == 'send') {
	$this->load_config();

	if (!$rcube->config->get('emoticons_compose', true)) {
	return $args;
	}

	require_once __DIR__ . '/emoticons_engine.php';

	$args['body'] = emoticons_engine::icons2text($args['body']);
	}

	return $args;
	}

	/**
	* 'html_editor' hook handler, where we enable emoticons in TinyMCE
	*/
	function html_editor($args)
	{
	$rcube = rcube::get_instance();

	$this->load_config();

	if ($rcube->config->get('emoticons_compose', true)) {
	$args['extra_plugins'][] = 'emoticons';
	$args['extra_buttons'][] = 'emoticons';
	}

	return $args;
	}

	/**
	* 'preferences_list' hook handler
	*/
	function preferences_list($args)
	{
	$rcube = rcube::get_instance();
	$dont_override = $rcube->config->get('dont_override', array());

	if ($args['section'] == 'mailview' && !in_array('emoticons_display', $dont_override)) {
	$this->load_config();
	$this->add_texts('localization');

	$field_id = 'emoticons_display';
	$checkbox = new html_checkbox(array('name' => '_' . $field_id, 'id' => $field_id, 'value' => 1));

	$args['blocks']['main']['options']['emoticons_display'] = array(
	'title' => $this->gettext('emoticonsdisplay'),
	'content' => $checkbox->show(intval($rcube->config->get('emoticons_display', false)))
	);
	}
	else if ($args['section'] == 'compose' && !in_array('emoticons_compose', $dont_override)) {
	$this->load_config();
	$this->add_texts('localization');

	$field_id = 'emoticons_compose';
	$checkbox = new html_checkbox(array('name' => '_' . $field_id, 'id' => $field_id, 'value' => 1));

	$args['blocks']['main']['options']['emoticons_compose'] = array(
	'title' => $this->gettext('emoticonscompose'),
	'content' => $checkbox->show(intval($rcube->config->get('emoticons_compose', true)))
	);
	}

	return $args;
	}

	/**
	* 'preferences_save' hook handler
	*/
	function preferences_save($args)
	{
	$rcube = rcube::get_instance();
	$dont_override = $rcube->config->get('dont_override', array());

	if ($args['section'] == 'mailview' && !in_array('emoticons_display', $dont_override)) {
	$args['prefs']['emoticons_display'] = rcube_utils::get_input_value('_emoticons_display', rcube_utils::INPUT_POST) ? true : false;
	}
	else if ($args['section'] == 'compose' && !in_array('emoticons_compose', $dont_override)) {
	$args['prefs']['emoticons_compose'] = rcube_utils::get_input_value('_emoticons_compose', rcube_utils::INPUT_POST) ? true : false;
	}

	return $args;
	}
	}
	diff --git a/plugins/hide_blockquote/hide_blockquote.php b/plugins/hide_blockquote/hide_blockquote.php
	index cf999be67..e3a4684a3 100644
	--- a/plugins/hide_blockquote/hide_blockquote.php
	+++ b/plugins/hide_blockquote/hide_blockquote.php
	@@ -1,78 +1,77 @@
	<?php

	/**
	* Quotation block hidding
	*
	* Plugin that adds a possibility to hide long blocks of cited text in messages.
	*
	* Configuration:
	* // Minimum number of citation lines. Longer citation blocks will be hidden.
	* // 0 - no limit (no hidding).
	* $config['hide_blockquote_limit'] = 0;
	*
	- * @version @package_version@
	* @license GNU GPLv3+
	* @author Aleksander Machniak <alec@alec.pl>
	*/
	class hide_blockquote extends rcube_plugin
	{
	public $task = 'mail\|settings';

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

	if ($rcmail->task == 'mail'
	&& ($rcmail->action == 'preview' \|\| $rcmail->action == 'show')
	&& ($limit = $rcmail->config->get('hide_blockquote_limit'))
	) {
	// include styles
	$this->include_stylesheet($this->local_skin_path() . "/style.css");

	// Script and localization
	$this->include_script('hide_blockquote.js');
	$this->add_texts('localization', true);

	// set env variable for client
	$rcmail->output->set_env('blockquote_limit', $limit);
	}
	else if ($rcmail->task == 'settings') {
	$dont_override = $rcmail->config->get('dont_override', array());
	if (!in_array('hide_blockquote_limit', $dont_override)) {
	$this->add_hook('preferences_list', array($this, 'prefs_table'));
	$this->add_hook('preferences_save', array($this, 'save_prefs'));
	}
	}
	}

	function prefs_table($args)
	{
	if ($args['section'] != 'mailview') {
	return $args;
	}

	$this->add_texts('localization');

	$rcmail = rcmail::get_instance();
	$limit = (int) $rcmail->config->get('hide_blockquote_limit');
	$field_id = 'hide_blockquote_limit';
	$input = new html_inputfield(array('name' => '_'.$field_id, 'id' => $field_id, 'size' => 5));

	$args['blocks']['main']['options']['hide_blockquote_limit'] = array(
	'title' => $this->gettext('quotelimit'),
	'content' => $input->show($limit ?: '')
	);

	return $args;
	}

	function save_prefs($args)
	{
	if ($args['section'] == 'mailview') {
	$args['prefs']['hide_blockquote_limit'] = (int) rcube_utils::get_input_value('_hide_blockquote_limit', rcube_utils::INPUT_POST);
	}

	return $args;
	}

	}
	diff --git a/plugins/http_authentication/http_authentication.php b/plugins/http_authentication/http_authentication.php
	index d3be5b7f5..e84cda243 100644
	--- a/plugins/http_authentication/http_authentication.php
	+++ b/plugins/http_authentication/http_authentication.php
	@@ -1,107 +1,106 @@
	<?php

	/**
	* HTTP Basic Authentication
	*
	* Make use of an existing HTTP authentication and perform login with the existing user credentials
	*
	* Configuration:
	* // redirect the client to this URL after logout. This page is then responsible to clear HTTP auth
	* $config['logout_url'] = 'http://server.tld/logout.html';
	*
	* See logout.html (in this directory) for an example how HTTP auth can be cleared.
	*
	* For other configuration options, see config.inc.php.dist!
	*
	- * @version @package_version@
	* @license GNU GPLv3+
	* @author Thomas Bruederli
	*/
	class http_authentication extends rcube_plugin
	{
	private $redirect_query;

	function init()
	{
	$this->add_hook('startup', array($this, 'startup'));
	$this->add_hook('authenticate', array($this, 'authenticate'));
	$this->add_hook('logout_after', array($this, 'logout'));
	$this->add_hook('login_after', array($this, 'login'));
	}

	function startup($args)
	{
	if (!empty($_SERVER['PHP_AUTH_USER'])) {
	$rcmail = rcmail::get_instance();
	$rcmail->add_shutdown_function(array('http_authentication', 'shutdown'));

	// handle login action
	if (empty($_SESSION['user_id'])) {
	$args['action'] = 'login';
	$this->redirect_query = $_SERVER['QUERY_STRING'];
	}
	// Set user password in session (see shutdown() method for more info)
	else if (!empty($_SESSION['user_id']) && empty($_SESSION['password'])
	&& !empty($_SERVER['PHP_AUTH_PW'])) {
	$_SESSION['password'] = $rcmail->encrypt($_SERVER['PHP_AUTH_PW']);
	}
	}

	return $args;
	}

	function authenticate($args)
	{
	// Load plugin's config file
	$this->load_config();

	$host = rcmail::get_instance()->config->get('http_authentication_host');
	if (is_string($host) && trim($host) !== '' && empty($args['host']))
	$args['host'] = rcube_utils::idn_to_ascii(rcube_utils::parse_host($host));

	// Allow entering other user data in login form,
	// e.g. after log out (#1487953)
	if (!empty($args['user'])) {
	return $args;
	}

	if (!empty($_SERVER['PHP_AUTH_USER'])) {
	$args['user'] = $_SERVER['PHP_AUTH_USER'];
	if (!empty($_SERVER['PHP_AUTH_PW']))
	$args['pass'] = $_SERVER['PHP_AUTH_PW'];
	}

	$args['cookiecheck'] = false;
	$args['valid'] = true;

	return $args;
	}

	function logout($args)
	{
	// redirect to configured URL in order to clear HTTP auth credentials
	if (!empty($_SERVER['PHP_AUTH_USER']) && $args['user'] == $_SERVER['PHP_AUTH_USER']) {
	if ($url = rcmail::get_instance()->config->get('logout_url')) {
	header("Location: $url", true, 307);
	}
	}
	}

	function shutdown()
	{
	// There's no need to store password (even if encrypted) in session
	// We'll set it back on startup (#1486553)
	rcmail::get_instance()->session->remove('password');
	}

	function login($args)
	{
	// Redirect to the previous QUERY_STRING
	if($this->redirect_query){
	header('Location: ./?' . $this->redirect_query);
	exit;
	}
	return $args;
	}
	}

	diff --git a/plugins/identity_select/identity_select.php b/plugins/identity_select/identity_select.php
	index 7973b5dad..7909ebb61 100644
	--- a/plugins/identity_select/identity_select.php
	+++ b/plugins/identity_select/identity_select.php
	@@ -1,68 +1,67 @@
	<?php

	/**
	* Identity selection based on additional message headers.
	*
	* On reply to a message user identity selection is based on
	* content of standard headers i.e. From, To, Cc and Return-Path.
	* Here you can add header(s) set by your SMTP server (e.g.
	* Delivered-To, Envelope-To, X-Envelope-To, X-RCPT-TO) to make
	* identity selection more accurate.
	*
	* Enable the plugin in config.inc.php and add your desired headers:
	* $config['identity_select_headers'] = array('Delivered-To');
	*
	- * @version @package_version@
	* @author Aleksander Machniak <alec@alec.pl>
	* @license GNU GPLv3+
	*/
	class identity_select extends rcube_plugin
	{
	public $task = 'mail';


	function init()
	{
	$this->add_hook('identity_select', array($this, 'select'));
	$this->add_hook('storage_init', array($this, 'storage_init'));
	}

	/**
	* Adds additional headers to supported headers list
	*/
	function storage_init($p)
	{
	$rcmail = rcmail::get_instance();

	if ($add_headers = (array)$rcmail->config->get('identity_select_headers', array())) {
	$p['fetch_headers'] = trim($p['fetch_headers'] . ' ' . strtoupper(join(' ', $add_headers)));
	}

	return $p;
	}

	/**
	* Identity selection
	*/
	function select($p)
	{
	if ($p['selected'] !== null \|\| !is_object($p['message']->headers)) {
	return $p;
	}

	$rcmail = rcmail::get_instance();

	foreach ((array)$rcmail->config->get('identity_select_headers', array()) as $header) {
	if ($header = $p['message']->headers->get($header, false)) {
	foreach ($p['identities'] as $idx => $ident) {
	if (in_array($ident['email_ascii'], (array)$header)) {
	$p['selected'] = $idx;
	break 2;
	}
	}
	}
	}

	return $p;
	}
	}
	diff --git a/plugins/krb_authentication/krb_authentication.php b/plugins/krb_authentication/krb_authentication.php
	index fe6f843cc..00a323fd3 100644
	--- a/plugins/krb_authentication/krb_authentication.php
	+++ b/plugins/krb_authentication/krb_authentication.php
	@@ -1,110 +1,109 @@
	<?php

	/**
	* Kerberos Authentication
	*
	* Make use of an existing Kerberos authentication and perform login
	* with the existing user credentials
	*
	* For other configuration options, see config.inc.php.dist!
	*
	- * @version @package_version@
	* @license GNU GPLv3+
	* @author Jeroen van Meeuwen
	*/
	class krb_authentication extends rcube_plugin
	{
	private $redirect_query;

	/**
	* Plugin initialization
	*/
	function init()
	{
	$this->add_hook('startup', array($this, 'startup'));
	$this->add_hook('authenticate', array($this, 'authenticate'));
	$this->add_hook('login_after', array($this, 'login'));
	$this->add_hook('storage_connect', array($this, 'storage_connect'));
	}

	/**
	* Startup hook handler
	*/
	function startup($args)
	{
	if (!empty($_SERVER['REMOTE_USER']) && !empty($_SERVER['KRB5CCNAME'])) {
	// handle login action
	if (empty($_SESSION['user_id'])) {
	$args['action'] = 'login';
	$this->redirect_query = $_SERVER['QUERY_STRING'];
	}
	else {
	$_SESSION['password'] = null;
	}
	}

	return $args;
	}

	/**
	* Authenticate hook handler
	*/
	function authenticate($args)
	{
	if (!empty($_SERVER['REMOTE_USER']) && !empty($_SERVER['KRB5CCNAME'])) {
	// Load plugin's config file
	$this->load_config();

	$rcmail = rcmail::get_instance();
	$host = $rcmail->config->get('krb_authentication_host');

	if (is_string($host) && trim($host) !== '' && empty($args['host'])) {
	$args['host'] = rcube_utils::idn_to_ascii(rcube_utils::parse_host($host));
	}

	if (!empty($_SERVER['REMOTE_USER'])) {
	$args['user'] = $_SERVER['REMOTE_USER'];
	$args['pass'] = null;
	}

	$args['cookiecheck'] = false;
	$args['valid'] = true;
	}

	return $args;
	}

	/**
	* Storage_connect hook handler
	*/
	function storage_connect($args)
	{
	if (!empty($_SERVER['REMOTE_USER']) && !empty($_SERVER['KRB5CCNAME'])) {
	// Load plugin's config file
	$this->load_config();

	$rcmail = rcmail::get_instance();
	$context = $rcmail->config->get('krb_authentication_context');

	$args['gssapi_context'] = $context ?: 'imap/kolab.example.org@EXAMPLE.ORG';
	$args['gssapi_cn'] = $_SERVER['KRB5CCNAME'];
	$args['auth_type'] = 'GSSAPI';
	}

	return $args;
	}

	/**
	* login_after hook handler
	*/
	function login($args)
	{
	// Redirect to the previous QUERY_STRING
	if ($this->redirect_query) {
	header('Location: ./?' . $this->redirect_query);
	exit;
	}

	return $args;
	}
	}
	diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php
	index 68d56a1ab..336479a97 100644
	--- a/plugins/managesieve/managesieve.php
	+++ b/plugins/managesieve/managesieve.php
	@@ -1,274 +1,273 @@
	<?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 as published by
	* the Free Software Foundation, either version 3 of the License, or
	* (at your option) any later version.
	*
	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.
	*
	* You should have received a copy of the GNU General Public License
	* along with this program. If not, see http://www.gnu.org/licenses/.
	*/

	class managesieve extends rcube_plugin
	{
	public $task = 'mail\|settings';
	private $rc;
	private $engine;

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

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

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

	// inject Create Filter popup stuff
	if (empty($this->rc->action) \|\| $this->rc->action == 'show'
	\|\| strpos($this->rc->action, 'plugin.managesieve') === 0
	) {
	$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/');

	$sieve_action = strpos($this->rc->action, 'plugin.managesieve') === 0;

	if ($this->rc->task == 'mail' \|\| $sieve_action) {
	$this->include_script('managesieve.js');
	}

	// include styles
	$skin_path = $this->local_skin_path();
	if ($sieve_action \|\| ($this->rc->task == 'settings' && empty($_REQUEST['_framed']))) {
	$this->include_stylesheet("$skin_path/managesieve.css");
	}
	else if ($this->rc->task == 'mail') {
	$this->include_stylesheet("$skin_path/managesieve_mail.css");
	}

	$this->ui_initialized = true;
	}

	/**
	* Adds Filters section in Settings
	*/
	function settings_actions($args)
	{
	$this->load_config();

	$vacation_mode = (int) $this->rc->config->get('managesieve_vacation');

	// register Filters action
	if ($vacation_mode != 2) {
	$args['actions'][] = array(
	'action' => 'plugin.managesieve',
	'class' => 'filter',
	'label' => 'filters',
	'domain' => 'managesieve',
	'title' => 'filterstitle',
	);
	}

	// register Vacation action
	if ($vacation_mode > 0) {
	$args['actions'][] = array(
	'action' => 'plugin.managesieve-vacation',
	'class' => 'vacation',
	'label' => 'vacation',
	'domain' => 'managesieve',
	'title' => 'vacationtitle',
	);
	}

	return $args;
	}

	/**
	* 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();

	// 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 = $this->parse_headers($args['headers']);

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

	return $args;
	}

	/**
	* Plugin action handler
	*/
	function managesieve_actions()
	{
	// handle fetching email headers for the new filter form
	if ($uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST)) {
	$uids = rcmail::get_uids();
	$mailbox = key($uids);
	$message = new rcube_message($uids[$mailbox][0], $mailbox);
	$headers = $this->parse_headers($message->headers);

	$this->rc->output->set_env('sieve_headers', $headers);
	$this->rc->output->command('managesieve_create', true);
	$this->rc->output->send();
	}

	// handle other actions
	$engine_type = $this->rc->action == 'plugin.managesieve-vacation' ? 'vacation' : '';
	$engine = $this->get_engine($engine_type);

	$this->init_ui();
	$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
	*/
	public function get_engine($type = null)
	{
	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);

	$class_name = 'rcube_sieve_' . ($type ?: 'engine');
	$this->engine = new $class_name($this);
	}

	return $this->engine;
	}

	/**
	* Extract mail headers for new filter form
	*/
	private function parse_headers($headers)
	{
	$result = array();

	if ($headers->subject)
	$result[] = 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']) {
	$result[] = array($h, $item['mailto']);
	}
	}
	}
	}

	return $result;
	}
	}
	diff --git a/plugins/markasjunk/markasjunk.php b/plugins/markasjunk/markasjunk.php
	index 1f92390e5..aff3acc84 100644
	--- a/plugins/markasjunk/markasjunk.php
	+++ b/plugins/markasjunk/markasjunk.php
	@@ -1,78 +1,77 @@
	<?php

	/**
	* Mark as Junk
	*
	* Sample plugin that adds a new button to the mailbox toolbar
	* to mark the selected messages as Junk and move them to the Junk folder
	*
	- * @version @package_version@
	* @license GNU GPLv3+
	* @author Thomas Bruederli
	*/
	class markasjunk extends rcube_plugin
	{
	public $task = 'mail';

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

	$this->register_action('plugin.markasjunk', array($this, 'request_action'));
	$this->add_hook('storage_init', array($this, 'storage_init'));

	if ($rcmail->action == '' \|\| $rcmail->action == 'show') {
	$skin_path = $this->local_skin_path();

	$this->add_texts('localization', true);
	$this->include_script('markasjunk.js');

	if (is_file($this->home . "/$skin_path/markasjunk.css")) {
	$this->include_stylesheet("$skin_path/markasjunk.css");
	}

	$this->add_button(array(
	'type' => 'link',
	'label' => 'buttontext',
	'command' => 'plugin.markasjunk',
	'class' => 'button buttonPas junk disabled',
	'classact' => 'button junk',
	'title' => 'buttontitle',
	'domain' => 'markasjunk'
	),'toolbar');
	}
	}

	function storage_init($args)
	{
	$flags = array(
	'JUNK' => 'Junk',
	'NONJUNK' => 'NonJunk',
	);

	// register message flags
	$args['message_flags'] = array_merge((array)$args['message_flags'], $flags);

	return $args;
	}

	function request_action()
	{
	$this->add_texts('localization');

	$rcmail = rcmail::get_instance();
	$storage = $rcmail->get_storage();

	foreach (rcmail::get_uids() as $mbox => $uids) {
	$storage->unset_flag($uids, 'NONJUNK', $mbox);
	$storage->set_flag($uids, 'JUNK', $mbox);
	}

	if (($junk_mbox = $rcmail->config->get('junk_mbox'))) {
	$rcmail->output->command('move_messages', $junk_mbox);
	}

	$rcmail->output->command('display_message', $this->gettext('reportedasjunk'), 'confirmation');
	$rcmail->output->send();
	}
	}
	diff --git a/plugins/new_user_dialog/new_user_dialog.php b/plugins/new_user_dialog/new_user_dialog.php
	index 936eca3a3..6f93fcaca 100644
	--- a/plugins/new_user_dialog/new_user_dialog.php
	+++ b/plugins/new_user_dialog/new_user_dialog.php
	@@ -1,175 +1,174 @@
	<?php

	/**
	* Present identities settings dialog to new users
	*
	* When a new user is created, this plugin checks the default identity
	* and sets a session flag in case it is incomplete. An overlay box will appear
	* on the screen until the user has reviewed/completed his identity.
	*
	- * @version @package_version@
	* @license GNU GPLv3+
	* @author Thomas Bruederli
	* @author Aleksander Machniak
	*/
	class new_user_dialog extends rcube_plugin
	{
	public $task = '';
	public $noframe = true;


	function init()
	{
	$this->add_hook('identity_create', array($this, 'create_identity'));
	$this->register_action('plugin.newusersave', array($this, 'save_data'));

	// register additional hooks if session flag is set
	if ($_SESSION['plugin.newuserdialog']) {
	$this->add_hook('render_page', array($this, 'render_page'));
	}
	}

	/**
	* Check newly created identity at first login
	*/
	function create_identity($p)
	{
	// set session flag when a new user was created and the default identity seems to be incomplete
	if ($p['login'] && !$p['complete']) {
	$_SESSION['plugin.newuserdialog'] = true;
	}
	}

	/**
	* Callback function when HTML page is rendered
	* We'll add an overlay box here.
	*/
	function render_page($p)
	{
	if ($_SESSION['plugin.newuserdialog']) {
	$this->add_texts('localization');

	$rcmail = rcmail::get_instance();
	$identity = $rcmail->user->get_identity();
	$identities_level = intval($rcmail->config->get('identities_level', 0));

	// compose user-identity dialog
	$table = new html_table(array('cols' => 2));

	$table->add('title', $this->gettext('name'));
	$table->add(null, html::tag('input', array(
	'type' => 'text',
	'name' => '_name',
	'value' => $identity['name'],
	'disabled' => $identities_level == 4
	)));

	$table->add('title', $this->gettext('email'));
	$table->add(null, html::tag('input', array(
	'type' => 'text',
	'name' => '_email',
	'value' => rcube_utils::idn_to_utf8($identity['email']),
	'disabled' => in_array($identities_level, array(1, 3, 4))
	)));

	$table->add('title', $this->gettext('organization'));
	$table->add(null, html::tag('input', array(
	'type' => 'text',
	'name' => '_organization',
	'value' => $identity['organization'],
	'disabled' => $identities_level == 4
	)));

	$table->add('title', $this->gettext('signature'));
	$table->add(null, html::tag('textarea', array(
	'name' => '_signature',
	'rows' => '3',
	),
	$identity['signature']
	));

	// add overlay input box to html page
	$rcmail->output->add_footer(html::tag('form', array(
	'id' => 'newuserdialog',
	'action' => $rcmail->url('plugin.newusersave'),
	'method' => 'post'
	),
	html::p('hint', rcube::Q($this->gettext('identitydialoghint'))) .
	$table->show() .
	html::p(array('class' => 'formbuttons'),
	html::tag('input', array('type' => 'submit',
	'class' => 'button mainaction', 'value' => $this->gettext('save'))))
	));

	$title = rcube::JQ($this->gettext('identitydialogtitle'));
	$script = "
	$('#newuserdialog').show()
	.dialog({modal:true, resizable:false, closeOnEscape:false, width:450, title:'$title'})
	.submit(function() {
	var i, request = {}, form = $(this).serializeArray();
	for (i in form)
	request[form[i].name] = form[i].value;

	rcmail.http_post('plugin.newusersave', request, true);
	return false;
	});

	$('input[name=_name]').focus();
	rcube_webmail.prototype.new_user_dialog_close = function() { $('#newuserdialog').dialog('close'); }
	";
	// disable keyboard events for messages list (#1486726)
	$rcmail->output->add_script($script, 'docready');

	$this->include_stylesheet('newuserdialog.css');
	}
	}

	/**
	* Handler for submitted form (ajax request)
	*
	* Check fields and save to default identity if valid.
	* Afterwards the session flag is removed and we're done.
	*/
	function save_data()
	{
	$rcmail = rcmail::get_instance();
	$identity = $rcmail->user->get_identity();
	$ident_level = intval($rcmail->config->get('identities_level', 0));
	$disabled = array();

	$save_data = array(
	'name' => rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST),
	'email' => rcube_utils::get_input_value('_email', rcube_utils::INPUT_POST),
	'organization' => rcube_utils::get_input_value('_organization', rcube_utils::INPUT_POST),
	'signature' => rcube_utils::get_input_value('_signature', rcube_utils::INPUT_POST),
	);

	if ($ident_level == 4) {
	$disabled = array('name', 'email', 'organization');
	}
	else if (in_array($ident_level, array(1, 3))) {
	$disabled = array('email');
	}

	foreach ($disabled as $key) {
	$save_data[$key] = $identity[$key];
	}

	if (empty($save_data['name']) \|\| empty($save_data['email'])) {
	$rcmail->output->show_message('formincomplete', 'error');
	}
	else if (!rcube_utils::check_email($save_data['email'] = rcube_utils::idn_to_ascii($save_data['email']))) {
	$rcmail->output->show_message('emailformaterror', 'error', array('email' => $save_data['email']));
	}
	else {
	// save data
	$rcmail->user->update_identity($identity['identity_id'], $save_data);
	$rcmail->session->remove('plugin.newuserdialog');
	// hide dialog
	$rcmail->output->command('new_user_dialog_close');
	$rcmail->output->show_message('successfullysaved', 'confirmation');
	}

	$rcmail->output->send();
	}
	}
	diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php
	index b9054880e..8c686ede0 100644
	--- a/plugins/new_user_identity/new_user_identity.php
	+++ b/plugins/new_user_identity/new_user_identity.php
	@@ -1,133 +1,132 @@
	<?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+
	*/
	class new_user_identity extends rcube_plugin
	{
	public $task = 'login';

	private $rc;
	private $ldap;

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

	$this->add_hook('user_create', array($this, 'lookup_user_name'));
	$this->add_hook('login_after', array($this, 'login_after'));
	}

	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;
	$args['email_list'] = array();

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

	foreach (array_keys($results[0]) as $key) {
	if (!preg_match('/^email($\|:)/', $key)) {
	continue;
	}

	foreach ((array) $results->records[0][$key] as $alias) {
	if (strpos($alias, '@')) {
	$args['email_list'][] = rcube_utils::idn_to_ascii($alias);
	}
	}
	}

	}
	}

	return $args;
	}

	function login_after($args)
	{
	$this->load_config();

	if ($this->ldap \|\| !$this->rc->config->get('new_user_identity_onlogin')) {
	return $args;
	}

	$identities = $this->rc->user->list_emails();
	$ldap_entry = $this->lookup_user_name(array(
	'user' => $this->rc->user->data['username'],
	'host' => $this->rc->user->data['mail_host'],
	));

	foreach ((array) $ldap_entry['email_list'] as $email) {
	foreach ($identities as $identity) {
	if ($identity['email'] == $email) {
	continue 2;
	}
	}

	$plugin = $this->rc->plugins->exec_hook('identity_create', array(
	'login' => true,
	'record' => array(
	'user_id' => $this->rc->user->ID,
	'standard' => 0,
	'email' => $email,
	'name' => $ldap_entry['user_name']
	),
	));

	if (!$plugin['abort'] && $plugin['record']['email']) {
	$this->rc->user->insert_identity($plugin['record']);
	}
	}
	return $args;
	}

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

	$this->load_config();

	$addressbook = $this->rc->config->get('new_user_identity_addressbook');
	$ldap_config = (array)$this->rc->config->get('ldap_public');
	$match = $this->rc->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],
	$this->rc->config->get('ldap_debug'),
	$this->rc->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/newmail_notifier/newmail_notifier.php b/plugins/newmail_notifier/newmail_notifier.php
	index 74a091381..58b4a52b6 100644
	--- a/plugins/newmail_notifier/newmail_notifier.php
	+++ b/plugins/newmail_notifier/newmail_notifier.php
	@@ -1,216 +1,215 @@
	<?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 window.Notification API)
	*
	- * @version @package_version@
	* @author Aleksander Machniak <alec@alec.pl>
	*
	* Copyright (C) 2011-2016, Kolab Systems AG
	*
	* This program is free software: you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation, either version 3 of the License, or
	* (at your option) any later version.
	*
	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.
	*
	* You should have received a copy of the GNU General Public License
	* along with this program. If not, see http://www.gnu.org/licenses/.
	*/

	class 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 and only in main window
	if ($this->rc->output->type == 'html' && empty($_REQUEST['_framed']) && $this->rc->action == '') {
	$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
	);
	}
	}

	$type = 'desktop_timeout';
	$key = 'newmail_notifier_' . $type;
	if (!in_array($key, $dont_override)) {
	$field_id = '_' . $key;
	$select = new html_select(array('name' => $field_id, 'id' => $field_id));

	foreach (array(5, 10, 15, 30, 45, 60) as $sec) {
	$label = $this->rc->gettext(array('name' => 'afternseconds', 'vars' => array('n' => $sec)));
	$select->add($label, $sec);
	}

	$args['blocks']['new_message']['options'][$key] = array(
	'title' => html::label($field_id, rcube::Q($this->gettext('desktoptimeout'))),
	'content' => $select->show((int) $this->rc->config->get($key))
	);
	}

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

	$option = 'newmail_notifier_desktop_timeout';
	if (!in_array($option, $dont_override)) {
	if ($value = (int) rcube_utils::get_input_value('_' . $option, rcube_utils::INPUT_POST)) {
	$args['prefs'][$option] = $value;
	}
	}

	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->set_env('newmail_notifier_timeout', $this->rc->config->get('newmail_notifier_desktop_timeout'));
	$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/password/README b/plugins/password/README
	index 88cc849dd..c4bb7bea0 100644
	--- a/plugins/password/README
	+++ b/plugins/password/README
	@@ -1,365 +1,364 @@
	-----------------------------------------------------------------------
	Password Plugin for Roundcube
	-----------------------------------------------------------------------
	Plugin that adds a possibility to change user password using many
	methods (drivers) via Settings/Password tab.
	-----------------------------------------------------------------------
	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/.

	- @version @package_version@
	@author Aleksander Machniak <alec@alec.pl>
	@author <see driver files for driver authors>
	-----------------------------------------------------------------------

	1. Configuration
	2. Drivers
	2.1. Database (sql)
	2.2. Cyrus/SASL (sasl)
	2.3. Poppassd/Courierpassd (poppassd)
	2.4. LDAP (ldap)
	2.5. DirectAdmin Control Panel (directadmin)
	2.6. cPanel (cpanel)
	2.7. XIMSS/Communigate (ximms)
	2.8. Virtualmin (virtualmin)
	2.9. hMailServer (hmail)
	2.10. PAM (pam)
	2.11. Chpasswd (chpasswd)
	2.12. LDAP - no PEAR (ldap_simple)
	2.13. XMail (xmail)
	2.14. Pw (pw_usermod)
	2.15. domainFACTORY (domainfactory)
	2.16. DBMail (dbmail)
	2.17. Expect (expect)
	2.18. Samba (smb)
	2.19. Vpopmail daemon (vpopmaild)
	2.20. Plesk (Plesk RPC-API)
	2.21. Kpasswd
	3. Driver API
	4. Sudo setup


	1. Configuration
	----------------

	Copy config.inc.php.dist to config.inc.php and set the options as described
	within the file.


	2. Drivers
	----------

	Password plugin supports many password change mechanisms which are
	handled by included drivers. Just pass driver name in 'password_driver' option.


	2.1. Database (sql)
	-------------------

	You can specify which database to connect by 'password_db_dsn' option and
	what SQL query to execute by 'password_query'. See config.inc.php.dist file for
	more info.

	Example implementations of an update_passwd function:

	- This is for use with LMS (http://lms.org.pl) database and postgres:

	CREATE OR REPLACE FUNCTION update_passwd(hash text, account text) RETURNS integer AS $$
	DECLARE
	res integer;
	BEGIN
	UPDATE passwd SET password = hash
	WHERE login = split_part(account, '@', 1)
	AND domainid = (SELECT id FROM domains WHERE name = split_part(account, '@', 2))
	RETURNING id INTO res;
	RETURN res;
	END;
	$$ LANGUAGE plpgsql SECURITY DEFINER;

	- This is for use with a SELECT update_passwd(%o,%c,%u) query
	Updates the password only when the old password matches the MD5 password
	in the database

	CREATE FUNCTION update_password (oldpass text, cryptpass text, user text) RETURNS text
	MODIFIES SQL DATA
	BEGIN
	DECLARE currentsalt varchar(20);
	DECLARE error text;
	SET error = 'incorrect current password';
	SELECT substring_index(substr(user.password,4),_latin1'$',1) INTO currentsalt FROM users WHERE username=user;
	SELECT '' INTO error FROM users WHERE username=user AND password=ENCRYPT(oldpass,currentsalt);
	UPDATE users SET password=cryptpass WHERE username=user AND password=ENCRYPT(oldpass,currentsalt);
	RETURN error;
	END

	Example SQL UPDATEs:

	- Plain text passwords:
	UPDATE users SET password=%p WHERE username=%u AND password=%o AND domain=%h LIMIT 1

	- Crypt text passwords:
	UPDATE users SET password=%c WHERE username=%u LIMIT 1

	- Use a MYSQL crypt function (*nix only) with random 8 character salt
	UPDATE users SET password=ENCRYPT(%p,concat(_utf8'$1$',right(md5(rand()),8),_utf8'$')) WHERE username=%u LIMIT 1

	- MD5 stored passwords:
	UPDATE users SET password=MD5(%p) WHERE username=%u AND password=MD5(%o) LIMIT 1


	2.2. Cyrus/SASL (sasl)
	----------------------

	Cyrus SASL database authentication allows your Cyrus+Roundcube
	installation to host mail users without requiring a Unix Shell account!

	This driver only covers the "sasldb" case when using Cyrus SASL. Kerberos
	and PAM authentication mechanisms will require other techniques to enable
	user password manipulations.

	Cyrus SASL includes a shell utility called "saslpasswd" for manipulating
	user passwords in the "sasldb" database. This plugin attempts to use
	this utility to perform password manipulations required by your webmail
	users without any administrative interaction. Unfortunately, this
	scheme requires that the "saslpasswd" utility be run as the "cyrus"
	user - kind of a security problem since we have chosen to SUID a small
	script which will allow this to happen.

	This driver is based on the Squirrelmail Change SASL Password Plugin.
	See http://www.squirrelmail.org/plugin_view.php?id=107 for details.

	Installation:

	Change into the helpers directory. Edit the chgsaslpasswd.c file as is
	documented within it.

	Compile the wrapper program:
	gcc -o chgsaslpasswd chgsaslpasswd.c

	Chown the compiled chgsaslpasswd binary to the cyrus user and group
	that your browser runs as, then chmod them to 4550.

	For example, if your cyrus user is 'cyrus' and the apache server group is
	'nobody' (I've been told Redhat runs Apache as user 'apache'):

	chown cyrus:nobody chgsaslpasswd
	chmod 4550 chgsaslpasswd

	Stephen Carr has suggested users should try to run the scripts on a test
	account as the cyrus user eg;

	su cyrus -c "./chgsaslpasswd -p test_account"

	This will allow you to make sure that the script will work for your setup.
	Should the script not work, make sure that:
	1) the user the script runs as has access to the saslpasswd\|saslpasswd2
	file and proper permissions
	2) make sure the user in the chgsaslpasswd.c file is set correctly.
	This could save you some headaches if you are the paranoid type.


	2.3. Poppassd/Courierpassd (poppassd)
	-------------------------------------

	You can specify which host to connect to via 'password_pop_host' and
	what port via 'password_pop_port'. See config.inc.php.dist file for more info.


	2.4. LDAP (ldap)
	----------------

	See config.inc.php.dist file. Requires PEAR::Net_LDAP2 package.


	2.5. DirectAdmin Control Panel (directadmin)
	--------------------------------------------

	You can specify which host to connect to via 'password_directadmin_host' (don't
	forget to use tcp:// or ssl://) and what port via 'password_direactadmin_port'.
	The password enforcement with plenty customization can be done directly by
	DirectAdmin, please see http://www.directadmin.com/features.php?id=910
	See config.inc.php.dist file for more info.


	2.6. cPanel (cpanel)
	--------------------

	Install cPanel XMLAPI Client Class into Roundcube program/lib directory
	or any other place in PHP include path. You can get the class from
	https://raw.github.com/CpanelInc/xmlapi-php/master/xmlapi.php

	You can configure parameters for connection to cPanel's API interface.
	See config.inc.php.dist file for more info.


	2.7. XIMSS/Communigate (ximms)
	------------------------------

	You can specify which host and port to connect to via 'password_ximss_host'
	and 'password_ximss_port'. See config.inc.php.dist file for more info.


	2.8. Virtualmin (virtualmin)
	----------------------------

	As in sasl driver this one allows to change password using shell
	utility called "virtualmin". See helpers/chgvirtualminpasswd.c for
	installation instructions. See also config.inc.php.dist file.


	2.9. hMailServer (hmail)
	------------------------

	Requires PHP COM (Windows only). For access to hMail server on remote host
	you'll need to define 'hmailserver_remote_dcom' and 'hmailserver_server'.
	See config.inc.php.dist file for more info.


	2.10. PAM (pam)
	---------------

	This driver is for changing passwords of shell users authenticated with PAM.
	Requires PECL's PAM exitension to be installed (http://pecl.php.net/package/PAM).


	2.11. Chpasswd (chpasswd)
	-------------------------

	Driver that adds functionality to change the systems user password via
	the 'chpasswd' command. See config.inc.php.dist file.

	Attached wrapper script (helpers/chpass-wrapper.py) restricts password changes
	to uids >= 1000 and can deny requests based on a blacklist.


	2.12. LDAP - no PEAR (ldap_simple)
	-----------------------------------

	It's rewritten ldap driver that doesn't require the Net_LDAP2 PEAR extension.
	It uses directly PHP's ldap module functions instead (as Roundcube does).

	This driver is fully compatible with the ldap driver, but
	does not require (or uses) the
	$config['password_ldap_force_replace'] variable.
	Other advantages:
	* Connects only once with the LDAP server when using the search user.
	* Does not read the DN, but only replaces the password within (that is
	why the 'force replace' is always used).


	2.13. XMail (xmail)
	-----------------------------------

	Driver for XMail (www.xmailserver.org). See config.inc.php.dist file
	for configuration description.


	2.14. Pw (pw_usermod)
	-----------------------------------

	Driver to change the systems user password via the 'pw usermod' command.
	See config.inc.php.dist file for configuration description.


	2.15. domainFACTORY (domainfactory)
	-----------------------------------

	Driver for the hosting provider domainFACTORY (www.df.eu).
	No configuration options.


	2.16. DBMail (dbmail)
	-----------------------------------

	Driver that adds functionality to change the users DBMail password.
	It only works with dbmail-users on the same host where Roundcube runs
	and requires shell access and gcc in order to compile the binary
	(see instructions in chgdbmailusers.c file).
	See config.inc.php.dist file for configuration description.

	Note: DBMail users can also use sql driver.


	2.17. Expect (expect)
	-----------------------------------

	Driver to change user password via the 'expect' command.
	See config.inc.php.dist file for configuration description.


	2.18. Samba (smb)
	-----------------------------------

	Driver to change Samba user password via the 'smbpasswd' command.
	See config.inc.php.dist file for configuration description.


	2.19. Vpopmail daemon (vpopmaild)
	-----------------------------------

	Driver for the daemon of vpopmail. Vpopmail is used with qmail to
	enable virtual users that are saved in a database and not in /etc/passwd.

	Set $config['password_vpopmaild_host'] to the host where vpopmaild runs.

	Set $config['password_vpopmaild_port'] to the port of vpopmaild.

	Set $config['password_vpopmaild_timeout'] to the timeout used for the TCP
	connection to vpopmaild (You may want to set it higher on busy servers).


	2.20. Plesk (Plesk RPC-API)
	---------------------------

	Driver for changing Passwords via Plesk RPC-API. This Driver also works with
	Parallels Plesk Automation (PPA).

	You need to allow the IP of the Roundcube-Server for RPC-Calls in the Panel.

	Set $config['password_plesk_host'] to the Hostname / IP where Plesk runs
	Set your Admin or RPC User: $config['password_plesk_user']
	Set the Password of the User: $config['password_plesk_pass']
	Set $config['password_plesk_rpc_port'] for the RPC-Port. Usually its 8443
	Set the RPC-Path in $config['password_plesk_rpc_path']. Normally this is: enterprise/control/agent.php.


	2.21. Kpasswd
	-----------------------------------

	Driver to change the password in Kerberos environments via the 'kpasswd' command.
	See config.inc.php.dist file for configuration description.


	3. Driver API
	-------------

	Driver file (<driver_name>.php) must define rcube_<driver_name>_password class
	with public save() method that has two arguments. First - current password, second - new password.
	This method should return PASSWORD_SUCCESS on success or any of PASSWORD_CONNECT_ERROR,
	PASSWORD_CRYPT_ERROR, PASSWORD_ERROR when driver was unable to change password.
	Extended result (as a hash-array with 'message' and 'code' items) can be returned
	too. See existing drivers in drivers/ directory for examples.

	4. Sudo setup
	-------------

	Some drivers that execute system commands (like chpasswd) require use of sudo command.
	Here's a sample for CentOS 7:

	# cat <<END >/etc/sudoers.d/99-roundcubemail
	apache ALL=NOPASSWD:/usr/sbin/chpasswd
	Defaults:apache !requiretty
	<<END

	Note: on different systems the username (here 'apache') may be different, e.g. www.
	Note: on some systems the disabling tty line may not be needed.
	diff --git a/plugins/password/password.php b/plugins/password/password.php
	index 2c594df80..926683bb7 100644
	--- a/plugins/password/password.php
	+++ b/plugins/password/password.php
	@@ -1,674 +1,673 @@
	<?php

	/**
	* Password Plugin for Roundcube
	*
	- * @version @package_version@
	* @author Aleksander Machniak <alec@alec.pl>
	*
	* Copyright (C) 2005-2015, 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_IN_HISTORY', 4);
	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\|login';
	public $noframe = true;
	public $noajax = true;

	private $newuser = false;

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

	$this->load_config();

	if ($rcmail->task == 'settings') {
	if (!$this->check_host_login_exceptions()) {
	return;
	}

	$this->add_texts('localization/');

	$this->add_hook('settings_actions', array($this, 'settings_actions'));

	$this->register_action('plugin.password', array($this, 'password_init'));
	$this->register_action('plugin.password-save', array($this, 'password_save'));
	}
	else if ($rcmail->config->get('password_force_new_user')) {
	$this->add_hook('user_create', array($this, 'user_create'));
	$this->add_hook('login_after', array($this, 'login_after'));
	}
	}

	function settings_actions($args)
	{
	// register as settings action
	$args['actions'][] = array(
	'action' => 'plugin.password',
	'class' => 'password',
	'label' => 'password',
	'title' => 'changepasswd',
	'domain' => 'password',
	);

	return $args;
	}

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

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

	if (rcube_utils::get_input_value('_first', rcube_utils::INPUT_GET)) {
	$rcmail->output->command('display_message', $this->gettext('firstloginchange'), 'notice');
	}
	else if (!empty($_SESSION['password_expires'])) {
	if ($_SESSION['password_expires'] == 1) {
	$rcmail->output->command('display_message', $this->gettext('passwdexpired'), 'error');
	}
	else {
	$rcmail->output->command('display_message', $this->gettext(array(
	'name' => 'passwdexpirewarning',
	'vars' => array('expirationdatetime' => $_SESSION['password_expires'])
	)), 'warning');
	}
	}

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

	function password_save()
	{
	$this->register_handler('plugin.body', array($this, 'password_form'));

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

	$form_disabled = $rcmail->config->get('password_disabled');
	$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, warn user, return error
	else if ($sespwd == $newpwd && !$rcmail->config->get('password_force_save')) {
	$rcmail->output->command('display_message', $this->gettext('samepasswd'), 'error');
	}
	// 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()));
	}

	// Remove expiration date/time
	$rcmail->session->remove('password_expires');
	}
	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'
	);

	$form_disabled = $rcmail->config->get('password_disabled');

	$rcmail->output->set_env('product_name', $rcmail->config->get('product_name'));
	$rcmail->output->set_env('password_disabled', !empty($form_disabled));

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

	$rules = '';

	$required_length = intval($rcmail->config->get('password_minimum_length'));
	if ($required_length > 0) {
	$rules .= html::tag('li', array('id' => 'required-length'), $this->gettext(array(
	'name' => 'passwordshort',
	'vars' => array('length' => $required_length)
	)));
	}

	if ($rcmail->config->get('password_require_nonalpha')) {
	$rules .= html::tag('li', array('id' => 'require-nonalpha'), $this->gettext('passwordweak'));
	}

	if (!empty($rules)) {
	$rules = html::tag('ul', array('id' => 'ruleslist'), $rules);
	}

	$disabled_msg = '';
	if ($form_disabled) {
	$disabled_msg = is_string($form_disabled) ? $form_disabled : $this->gettext('disablednotice');
	$disabled_msg = html::div(array('class' => 'boxwarning', 'id' => 'password-notice'), $disabled_msg);
	}

	$submit_button = $rcmail->output->button(array(
	'command' => 'plugin.password-save',
	'type' => 'input',
	'class' => 'button mainaction',
	'label' => 'save',
	));

	$out = html::div(array('class' => 'box'),
	html::div(array('id' => 'prefs-title', 'class' => 'boxtitle'), $this->gettext('changepasswd'))
	. html::div(array('class' => 'boxcontent'),
	$disabled_msg . $table->show() . $rules . html::p(null, $submit_button)));

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

	$this->include_script('password.js');

	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);
	$message = '';

	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_IN_HISTORY:
	$reason = $this->gettext('passwdinhistory');
	break;
	case PASSWORD_ERROR:
	default:
	$reason = $this->gettext('internalerror');
	}

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

	return $reason;
	}

	function user_create($args)
	{
	$this->newuser = true;
	return $args;
	}

	function login_after($args)
	{
	if ($this->newuser && $this->check_host_login_exceptions()) {
	$args['_task'] = 'settings';
	$args['_action'] = 'plugin.password';
	$args['_first'] = 'true';
	}

	return $args;
	}

	// Check if host and login is allowed to change the password, false = not allowed, true = not allowed
	private function check_host_login_exceptions()
	{
	$rcmail = rcmail::get_instance();

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

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

	return true;
	}

	/**
	* Hashes a password and returns the hash based on the specified method
	*
	* Parts of the code originally from the phpLDAPadmin development team
	* http://phpldapadmin.sourceforge.net/
	*
	* @param string Clear password
	* @param string Hashing method
	* @param bool\|string Prefix string or TRUE to add a default prefix
	*
	* @return string Hashed password
	*/
	static function hash_password($password, $method = '', $prefixed = true)
	{
	$method = strtolower($method);
	$rcmail = rcmail::get_instance();
	$prefix = '';
	$crypted = '';
	$default = false;

	if (empty($method) \|\| $method == 'default') {
	$method = $rcmail->config->get('password_algorithm');
	$prefixed = $rcmail->config->get('password_algorithm_prefix');
	$default = true;
	}
	else if ($method == 'crypt') { // deprecated
	if (!($method = $rcmail->config->get('password_crypt_hash'))) {
	$method = 'md5';
	}

	if (!strpos($method, '-crypt')) {
	$method .= '-crypt';
	}
	}

	switch ($method) {
	case 'des':
	case 'des-crypt':
	$crypted = crypt($password, rcube_utils::random_bytes(2));
	$prefix = '{CRYPT}';
	break;

	case 'ext_des': // for BC
	case 'ext-des-crypt':
	$crypted = crypt($password, '_' . rcube_utils::random_bytes(8));
	$prefix = '{CRYPT}';
	break;

	case 'md5crypt': // for BC
	case 'md5-crypt':
	$crypted = crypt($password, '$1$' . rcube_utils::random_bytes(9));
	$prefix = '{CRYPT}';
	break;

	case 'sha256-crypt':
	$rounds = (int) $rcmail->config->get('password_crypt_rounds');
	$prefix = '$5$';

	if ($rounds > 1000) {
	$prefix .= 'rounds=' . $rounds . '$';
	}

	$crypted = crypt($password, $prefix . rcube_utils::random_bytes(16));
	$prefix = '{CRYPT}';
	break;

	case 'sha512-crypt':
	$rounds = (int) $rcmail->config->get('password_crypt_rounds');
	$prefix = '$6$';

	if ($rounds > 1000) {
	$prefix .= 'rounds=' . $rounds . '$';
	}

	$crypted = crypt($password, $prefix . rcube_utils::random_bytes(16));
	$prefix = '{CRYPT}';
	break;

	case 'blowfish': // for BC
	case 'blowfish-crypt':
	$cost = (int) $rcmail->config->get('password_blowfish_cost');
	$cost = $cost < 4 \|\| $cost > 31 ? 12 : $cost;
	$prefix = sprintf('$2a$%02d$', $cost);

	$crypted = crypt($password, $prefix . rcube_utils::random_bytes(22));
	$prefix = '{CRYPT}';
	break;

	case 'md5':
	$crypted = base64_encode(pack('H*', md5($password)));
	$prefix = '{MD5}';
	break;

	case 'sha':
	if (function_exists('sha1')) {
	$crypted = pack('H*', sha1($password));
	}
	else if (function_exists('hash')) {
	$crypted = hash('sha1', $password, true);
	}
	else if (function_exists('mhash')) {
	$crypted = mhash(MHASH_SHA1, $password);
	}
	else {
	rcube::raise_error(array(
	'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
	'message' => "Password plugin: Your PHP install does not have the mhash()/hash() nor sha1() function"
	), true, true);
	}

	$crypted = base64_encode($crypted);
	$prefix = '{SHA}';
	break;

	case 'ssha':
	$salt = rcube_utils::random_bytes(8);

	if (function_exists('mhash') && function_exists('mhash_keygen_s2k')) {
	$salt = mhash_keygen_s2k(MHASH_SHA1, $password, $salt, 4);
	$crypted = mhash(MHASH_SHA1, $password . $salt);
	}
	else if (function_exists('sha1')) {
	$salt = substr(pack("H*", sha1($salt . $password)), 0, 4);
	$crypted = sha1($password . $salt, true);
	}
	else if (function_exists('hash')) {
	$salt = substr(pack("H*", hash('sha1', $salt . $password)), 0, 4);
	$crypted = hash('sha1', $password . $salt, true);
	}
	else {
	rcube::raise_error(array(
	'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
	'message' => "Password plugin: Your PHP install does not have the mhash()/hash() nor sha1() function"
	), true, true);
	}

	$crypted = base64_encode($crypted . $salt);
	$prefix = '{SSHA}';
	break;

	case 'smd5':
	$salt = rcube_utils::random_bytes(8);

	if (function_exists('mhash') && function_exists('mhash_keygen_s2k')) {
	$salt = mhash_keygen_s2k(MHASH_MD5, $password, $salt, 4);
	$crypted = mhash(MHASH_MD5, $password . $salt);
	}
	else if (function_exists('hash')) {
	$salt = substr(pack("H*", hash('md5', $salt . $password)), 0, 4);
	$crypted = hash('md5', $password . $salt, true);
	}
	else {
	$salt = substr(pack("H*", md5($salt . $password)), 0, 4);
	$crypted = md5($password . $salt, true);
	}

	$crypted = base64_encode($crypted . $salt);
	$prefix = '{SMD5}';
	break;

	case 'samba':
	if (function_exists('hash')) {
	$crypted = hash('md4', rcube_charset::convert($password, RCUBE_CHARSET, 'UTF-16LE'));
	$crypted = strtoupper($crypted);
	}
	else {
	rcube::raise_error(array(
	'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
	'message' => "Password plugin: Your PHP install does not have hash() function"
	), true, true);
	}
	break;

	case 'ad':
	$crypted = rcube_charset::convert('"' . $password . '"', RCUBE_CHARSET, 'UTF-16LE');
	break;

	case 'cram-md5': // deprecated
	require_once __DIR__ . '/../helpers/dovecot_hmacmd5.php';
	$crypted = dovecot_hmacmd5($password);
	$prefix = '{CRAM-MD5}';
	break;

	case 'dovecot':
	if (!($dovecotpw = $rcmail->config->get('password_dovecotpw'))) {
	$dovecotpw = 'dovecotpw';
	}
	if (!($method = $rcmail->config->get('password_dovecotpw_method'))) {
	$method = 'CRAM-MD5';
	}

	// use common temp dir
	$tmp_dir = $rcmail->config->get('temp_dir');
	$tmpfile = tempnam($tmp_dir, 'roundcube-');

	$pipe = popen("$dovecotpw -s '$method' > '$tmpfile'", "w");
	if (!$pipe) {
	unlink($tmpfile);
	return false;
	}
	else {
	fwrite($pipe, $password . "\n", 1+strlen($password)); usleep(1000);
	fwrite($pipe, $password . "\n", 1+strlen($password));
	pclose($pipe);

	$crypted = trim(file_get_contents($tmpfile), "\n");
	unlink($tmpfile);

	if (!preg_match('/^\{' . $method . '\}/', $crypted)) {
	return false;
	}

	if (!$default) {
	$prefixed = (bool) $rcmail->config->get('password_dovecotpw_with_method');
	}

	if (!$prefixed) {
	$crypted = trim(str_replace('{' . $method . '}', '', $crypted));
	}

	$prefixed = false;
	}

	break;

	case 'hash': // deprecated
	if (!extension_loaded('hash')) {
	rcube::raise_error(array(
	'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
	'message' => "Password plugin: 'hash' extension not loaded!"
	), true, true);
	}

	if (!($hash_algo = strtolower($rcmail->config->get('password_hash_algorithm')))) {
	$hash_algo = 'sha1';
	}

	$crypted = hash($hash_algo, $password);

	if ($rcmail->config->get('password_hash_base64')) {
	$crypted = base64_encode(pack('H*', $crypted));
	}

	break;

	case 'clear':
	$crypted = $password;
	}

	if ($crypted === null \|\| $crypted === false) {
	return false;
	}

	if ($prefixed && $prefixed !== true) {
	$prefix = $prefixed;
	$prefixed = true;
	}

	if ($prefixed === true && $prefix) {
	$crypted = $prefix . $crypted;
	}

	return $crypted;
	}
	}
	diff --git a/plugins/show_additional_headers/show_additional_headers.php b/plugins/show_additional_headers/show_additional_headers.php
	index b7f01104c..87de51fca 100644
	--- a/plugins/show_additional_headers/show_additional_headers.php
	+++ b/plugins/show_additional_headers/show_additional_headers.php
	@@ -1,51 +1,50 @@
	<?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.inc.php and add your desired headers:
	* $config['show_additional_headers'] = array('User-Agent');
	*
	- * @version @package_version@
	* @author Thomas Bruederli
	* @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/subscriptions_option.php b/plugins/subscriptions_option/subscriptions_option.php
	index fa4063135..5b38ca93e 100644
	--- a/plugins/subscriptions_option/subscriptions_option.php
	+++ b/plugins/subscriptions_option/subscriptions_option.php
	@@ -1,95 +1,94 @@
	<?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.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:
	* $config['dont_override'] = array('use_subscriptions');
	* and then set the global preference
	* $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']);

	// 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)) {
	foreach ($args['list'] as $idx => $data) {
	$args['list'][$idx]['content'] = preg_replace('/<input [^>]+>/', '', $data['content']);
	}
	}
	return $args;
	}
	}
	diff --git a/plugins/vcard_attachments/vcard_attachments.php b/plugins/vcard_attachments/vcard_attachments.php
	index 622f8907c..ebc494e45 100644
	--- a/plugins/vcard_attachments/vcard_attachments.php
	+++ b/plugins/vcard_attachments/vcard_attachments.php
	@@ -1,226 +1,225 @@
	<?php

	/**
	* Detect VCard attachments and show a button to add them to address book
	*
	- * @version @package_version@
	* @license GNU GPLv3+
	* @author Thomas Bruederli, Aleksander Machniak
	*/
	class vcard_attachments extends rcube_plugin
	{
	public $task = 'mail';

	private $message;
	private $vcard_parts = array();
	private $vcard_bodies = array();

	function init()
	{
	$rcmail = rcmail::get_instance();
	if ($rcmail->action == 'show' \|\| $rcmail->action == 'preview') {
	$this->add_hook('message_load', array($this, 'message_load'));
	$this->add_hook('template_object_messagebody', array($this, 'html_output'));
	}
	else if (!$rcmail->output->framed && (!$rcmail->action \|\| $rcmail->action == 'list')) {
	$icon = 'plugins/vcard_attachments/' .$this->local_skin_path(). '/vcard.png';
	$rcmail->output->set_env('vcard_icon', $icon);
	$this->include_script('vcardattach.js');
	}

	$this->register_action('plugin.savevcard', array($this, 'save_vcard'));
	}

	/**
	* Check message bodies and attachments for vcards
	*/
	function message_load($p)
	{
	$this->message = $p['object'];

	// handle attachments vcard attachments
	foreach ((array)$this->message->attachments as $attachment) {
	if ($this->is_vcard($attachment)) {
	$this->vcard_parts[] = $attachment->mime_id;
	}
	}
	// the same with message bodies
	foreach ((array)$this->message->parts as $part) {
	if ($this->is_vcard($part)) {
	$this->vcard_parts[] = $part->mime_id;
	$this->vcard_bodies[] = $part->mime_id;
	}
	}

	if ($this->vcard_parts)
	$this->add_texts('localization');
	}

	/**
	* This callback function adds a box below the message content
	* if there is a vcard attachment available
	*/
	function html_output($p)
	{
	$attach_script = false;

	foreach ($this->vcard_parts as $part) {
	$vcards = rcube_vcard::import($this->message->get_part_content($part, null, true));

	// successfully parsed vcards?
	if (empty($vcards)) {
	continue;
	}

	// remove part's body
	if (in_array($part, $this->vcard_bodies)) {
	$p['content'] = '';
	}

	foreach ($vcards as $idx => $vcard) {
	// skip invalid vCards
	if (empty($vcard->email) \|\| empty($vcard->email[0])) {
	continue;
	}

	$display = $vcard->displayname . ' <'.$vcard->email[0].'>';

	// add box below message body
	$p['content'] .= html::p(array('class' => 'vcardattachment'),
	html::a(array(
	'href' => "#",
	'onclick' => "return plugin_vcard_save_contact('" . rcube::JQ($part.':'.$idx) . "')",
	'title' => $this->gettext('addvcardmsg'),
	),
	html::span(null, rcube::Q($display)))
	);
	}

	$attach_script = true;
	}

	if ($attach_script) {
	$this->include_script('vcardattach.js');
	$this->include_stylesheet($this->local_skin_path() . '/style.css');
	}

	return $p;
	}

	/**
	* Handler for request action
	*/
	function save_vcard()
	{
	$this->add_texts('localization', true);

	$uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
	$mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
	$mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST);

	$rcmail = rcmail::get_instance();
	$message = new rcube_message($uid, $mbox);

	if ($uid && $mime_id) {
	list($mime_id, $index) = explode(':', $mime_id);
	$part = $message->get_part_content($mime_id, null, true);
	}

	$error_msg = $this->gettext('vcardsavefailed');

	if ($part && ($vcards = rcube_vcard::import($part))
	&& ($vcard = $vcards[$index]) && $vcard->displayname && $vcard->email
	) {
	$CONTACTS = $this->get_address_book();
	$email = $vcard->email[0];
	$contact = $vcard->get_assoc();
	$valid = true;

	// skip entries without an e-mail address or invalid
	if (empty($email) \|\| !$CONTACTS->validate($contact, true)) {
	$valid = false;
	}
	else {
	// We're using UTF8 internally
	$email = rcube_utils::idn_to_utf8($email);

	// compare e-mail address
	$existing = $CONTACTS->search('email', $email, 1, false);
	// compare display name
	if (!$existing->count && $vcard->displayname) {
	$existing = $CONTACTS->search('name', $vcard->displayname, 1, false);
	}

	if ($existing->count) {
	$rcmail->output->command('display_message', $this->gettext('contactexists'), 'warning');
	$valid = false;
	}
	}

	if ($valid) {
	$plugin = $rcmail->plugins->exec_hook('contact_create', array('record' => $contact, 'source' => null));
	$contact = $plugin['record'];

	if (!$plugin['abort'] && $CONTACTS->insert($contact))
	$rcmail->output->command('display_message', $this->gettext('addedsuccessfully'), 'confirmation');
	else
	$rcmail->output->command('display_message', $error_msg, 'error');
	}
	}
	else {
	$rcmail->output->command('display_message', $error_msg, 'error');
	}

	$rcmail->output->send();
	}

	/**
	* Checks if specified message part is a vcard data
	*
	* @param rcube_message_part Part object
	*
	* @return boolean True if part is of type vcard
	*/
	function is_vcard($part)
	{
	return (
	// Content-Type: text/vcard;
	$part->mimetype == 'text/vcard' \|\|
	// Content-Type: text/x-vcard;
	$part->mimetype == 'text/x-vcard' \|\|
	// Content-Type: text/directory; profile=vCard;
	($part->mimetype == 'text/directory' && (
	($part->ctype_parameters['profile'] &&
	strtolower($part->ctype_parameters['profile']) == 'vcard')
	// Content-Type: text/directory; (with filename=*.vcf)
	\|\| ($part->filename && preg_match('/\.vcf$/i', $part->filename))
	)
	)
	);
	}

	/**
	* Getter for default (writable) addressbook
	*/
	private function get_address_book()
	{
	if ($this->abook) {
	return $this->abook;
	}

	$rcmail = rcmail::get_instance();
	$abook = $rcmail->config->get('default_addressbook');

	// Get configured addressbook
	$CONTACTS = $rcmail->get_address_book($abook, true);

	// Get first writeable addressbook if the configured doesn't exist
	// This can happen when user deleted the addressbook (e.g. Kolab folder)
	if ($abook === null \|\| $abook === '' \|\| !is_object($CONTACTS)) {
	$source = reset($rcmail->get_address_sources(true));
	$CONTACTS = $rcmail->get_address_book($source['id'], true);
	}

	return $this->abook = $CONTACTS;
	}
	}
	diff --git a/plugins/virtuser_file/virtuser_file.php b/plugins/virtuser_file/virtuser_file.php
	index f2b357aaf..2d78717a5 100644
	--- a/plugins/virtuser_file/virtuser_file.php
	+++ b/plugins/virtuser_file/virtuser_file.php
	@@ -1,105 +1,104 @@
	<?php

	/**
	* File based User-to-Email and Email-to-User lookup
	*
	* Add it to the plugins list in config.inc.php and set
	* path to a virtuser table file to resolve user names and e-mail
	* addresses
	* $rcmail['virtuser_file'] = '';
	*
	- * @version @package_version@
	* @license GNU GPLv3+
	* @author Aleksander Machniak
	*/
	class virtuser_file extends rcube_plugin
	{
	private $file;
	private $app;

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

	if ($this->file) {
	$this->add_hook('user2email', array($this, 'user2email'));
	$this->add_hook('email2user', array($this, 'email2user'));
	}
	}

	/**
	* User > Email
	*/
	function user2email($p)
	{
	$r = $this->findinvirtual('/\s' . preg_quote($p['user'], '/') . '\s*$/');
	$result = array();

	for ($i=0; $i<count($r); $i++) {
	$arr = preg_split('/\s+/', $r[$i]);

	if (count($arr) > 0 && strpos($arr[0], '@')) {
	$result[] = rcube_utils::idn_to_ascii(trim(str_replace('\\@', '@', $arr[0])));

	if ($p['first']) {
	$p['email'] = $result[0];
	break;
	}
	}
	}

	$p['email'] = empty($result) ? NULL : $result;

	return $p;
	}

	/**
	* Email > User
	*/
	function email2user($p)
	{
	$r = $this->findinvirtual('/^' . preg_quote($p['email'], '/') . '\s/');

	for ($i=0; $i<count($r); $i++) {
	$arr = preg_split('/\s+/', trim($r[$i]));

	if (count($arr) > 0) {
	$p['user'] = trim($arr[count($arr)-1]);
	break;
	}
	}

	return $p;
	}

	/**
	* Find matches of the given pattern in virtuser file
	*
	* @param string Regular expression to search for
	* @return array Matching entries
	*/
	private function findinvirtual($pattern)
	{
	$result = array();
	$virtual = null;

	if ($this->file)
	$virtual = file($this->file);

	if (empty($virtual))
	return $result;

	// check each line for matches
	foreach ($virtual as $line) {
	$line = trim($line);
	if (empty($line) \|\| $line[0]=='#')
	continue;

	if (preg_match($pattern, $line))
	$result[] = $line;
	}

	return $result;
	}
	}
	diff --git a/plugins/virtuser_query/virtuser_query.php b/plugins/virtuser_query/virtuser_query.php
	index c08d6bd38..08db1dd21 100644
	--- a/plugins/virtuser_query/virtuser_query.php
	+++ b/plugins/virtuser_query/virtuser_query.php
	@@ -1,165 +1,164 @@
	<?php

	/**
	* DB based User-to-Email and Email-to-User lookup
	*
	* Add it to the plugins list in config.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
	*
	* $config['virtuser_query'] = array('email' => '', 'user' => '', 'host' => '', 'alias' => '');
	*
	* 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 $config['virtuser_query_dsn'] option.
	*
	- * @version @package_version@
	* @author Aleksander Machniak <alec@alec.pl>
	* @author Steffen Vogel
	* @author Tim Gerundt
	* @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'));
	}
	if ($this->config['alias']) {
	$this->add_hook('authenticate', array($this, 'alias2user'));
	}
	}
	}

	/**
	* 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' => (string) $sql_arr[1],
	'organization' => (string) $sql_arr[2],
	'reply-to' => (string) rcube_utils::idn_to_ascii($sql_arr[3]),
	'bcc' => (string) rcube_utils::idn_to_ascii($sql_arr[4]),
	'signature' => (string) $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;
	}

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

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

	if ($sql_arr = $dbh->fetch_array($sql_result)) {
	$p['user'] = $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, 4:46 AM (6 h, 44 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 428099
Default Alt Text: (161 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions