No OneTemporary
Actions

Authored By

Unknown

Size

74 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc
	index 3959bfada..ddc0e765a 100644
	--- a/program/steps/addressbook/export.inc
	+++ b/program/steps/addressbook/export.inc
	@@ -1,179 +1,181 @@
	<?php

	/**
	+-----------------------------------------------------------------------+
	\| This file is part of the Roundcube Webmail client \|
	\| \|
	\| Copyright (C) The Roundcube Dev Team \|
	\| Copyright (C) Kolab Systems AG \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Export the selected address book as vCard file \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	\| Author: Aleksander Machniak <machniak@kolabsys.com> \|
	+-----------------------------------------------------------------------+
	*/

	$RCMAIL->request_security_check(rcube_utils::INPUT_GET);

	// Use search result
	-if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']])) {
	+if (!empty($_REQUEST['_search']) && isset($_SESSION['contact_search'][$_REQUEST['_search']])
	+ && is_array($_SESSION['contact_search'][$_REQUEST['_search']])
	+) {
	$sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');
	- $search = (array)$_SESSION['search'][$_REQUEST['_search']];
	+ $search = $_SESSION['contact_search'][$_REQUEST['_search']];
	$records = array();

	// Get records from all sources
	foreach ($search as $s => $set) {
	$source = $RCMAIL->get_address_book($s);

	// reset page
	$source->set_page(1);
	$source->set_pagesize(99999);
	$source->set_search_set($set);

	// get records
	$result = $source->list_records();

	while ($record = $result->next()) {
	// because vcard_map is per-source we need to create vcard here
	prepare_for_export($record, $source);

	$record['sourceid'] = $s;
	$key = rcube_addressbook::compose_contact_key($record, $sort_col);
	$records[$key] = $record;
	}

	unset($result);
	}

	// sort the records
	ksort($records, SORT_LOCALE_STRING);

	// create resultset object
	$count = count($records);
	$result = new rcube_result_set($count);
	$result->records = array_values($records);
	}
	// selected contacts
	else if (!empty($_REQUEST['_cid'])) {
	$sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');
	$records = array();

	// Selected contact IDs (with multi-source support)
	$cids = rcmail_get_cids();

	foreach ($cids as $s => $ids) {
	$source = $RCMAIL->get_address_book($s);

	// reset page and page size (#6103)
	$source->set_page(1);
	$source->set_pagesize(count($ids));

	$result = $source->search('ID', $ids, 1, true, true);

	while ($record = $result->next()) {
	// because vcard_map is per-source we need to create vcard here
	prepare_for_export($record, $source);

	$record['sourceid'] = $s;
	$key = rcube_addressbook::compose_contact_key($record, $sort_col);
	$records[$key] = $record;
	}
	}

	ksort($records, SORT_LOCALE_STRING);

	// create resultset object
	$count = count($records);
	$result = new rcube_result_set($count);
	$result->records = array_values($records);
	}
	// selected directory/group
	else {
	$CONTACTS = rcmail_contact_source(null, true);

	// get contacts for this user
	$CONTACTS->set_page(1);
	$CONTACTS->set_pagesize(99999);
	$result = $CONTACTS->list_records(null, 0, true);
	}

	// Give plugins a possibility to implement other output formats or modify the result
	$plugin = $RCMAIL->plugins->exec_hook('addressbook_export', array('result' => $result));
	$result = $plugin['result'];

	if ($plugin['abort']) {
	exit;
	}

	// send downlaod headers
	header('Content-Type: text/vcard; charset=' . RCUBE_CHARSET);
	header('Content-Disposition: attachment; filename="contacts.vcf"');

	while ($result && ($row = $result->next())) {
	if ($CONTACTS) {
	prepare_for_export($row, $CONTACTS);
	}

	// fix folding and end-of-line chars
	$row['vcard'] = preg_replace('/\r\|\n\s+/', '', $row['vcard']);
	$row['vcard'] = preg_replace('/\n/', rcube_vcard::$eol, $row['vcard']);
	echo rcube_vcard::rfc2425_fold($row['vcard']) . rcube_vcard::$eol;
	}

	exit;


	/**
	* Copy contact record properties into a vcard object
	*/
	function prepare_for_export(&$record, $source = null)
	{
	$groups = $source && $source->groups && $source->export_groups ? $source->get_record_groups($record['ID']) : null;
	$fieldmap = $source ? $source->vcard_map : null;

	if (empty($record['vcard'])) {
	$vcard = new rcube_vcard($record['vcard'], RCUBE_CHARSET, false, $fieldmap);
	$vcard->reset();

	foreach ($record as $key => $values) {
	list($field, $section) = explode(':', $key);
	// avoid unwanted casting of DateTime objects to an array
	// (same as in rcube_contacts::convert_save_data())
	if (is_object($values) && is_a($values, 'DateTime')) {
	$values = array($values);
	}

	foreach ((array) $values as $value) {
	if (is_array($value) \|\| is_a($value, 'DateTime') \|\| @strlen($value)) {
	$vcard->set($field, $value, strtoupper($section));
	}
	}
	}

	// append group names
	if ($groups) {
	$vcard->set('groups', join(',', $groups), null);
	}

	$record['vcard'] = $vcard->export();
	}
	// patch categories to alread existing vcard block
	else if ($record['vcard']) {
	$vcard = new rcube_vcard($record['vcard'], RCUBE_CHARSET, false, $fieldmap);

	// unset CATEGORIES entry, it might be not up-to-date (#1490277)
	$vcard->set('groups', null);
	$record['vcard'] = $vcard->export();

	if (!empty($groups)) {
	$vgroups = 'CATEGORIES:' . rcube_vcard::vcard_quote($groups, ',');
	$record['vcard'] = str_replace('END:VCARD', $vgroups . rcube_vcard::$eol . 'END:VCARD', $record['vcard']);
	}
	}
	}
	diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
	index 8cbf8af43..cdc8a0e67 100644
	--- a/program/steps/addressbook/func.inc
	+++ b/program/steps/addressbook/func.inc
	@@ -1,1078 +1,1080 @@
	<?php

	/**
	+-----------------------------------------------------------------------+
	\| This file is part of the Roundcube Webmail client \|
	\| \|
	\| Copyright (C) The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Provide addressbook functionality and GUI objects \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	$SEARCH_MODS_DEFAULT = array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1);

	// general definition of contact coltypes
	$CONTACT_COLTYPES = array(
	'name' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('name'), 'category' => 'main'),
	'firstname' => array('type' => 'text', 'size' => 19, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('firstname'), 'category' => 'main'),
	'surname' => array('type' => 'text', 'size' => 19, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('surname'), 'category' => 'main'),
	'email' => array('type' => 'text', 'size' => 40, 'maxlength' => 254, 'label' => $RCMAIL->gettext('email'), 'subtypes' => array('home','work','other'), 'category' => 'main'),
	'middlename' => array('type' => 'text', 'size' => 19, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('middlename'), 'category' => 'main'),
	'prefix' => array('type' => 'text', 'size' => 8, 'maxlength' => 20, 'limit' => 1, 'label' => $RCMAIL->gettext('nameprefix'), 'category' => 'main'),
	'suffix' => array('type' => 'text', 'size' => 8, 'maxlength' => 20, 'limit' => 1, 'label' => $RCMAIL->gettext('namesuffix'), 'category' => 'main'),
	'nickname' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('nickname'), 'category' => 'main'),
	'jobtitle' => array('type' => 'text', 'size' => 40, 'maxlength' => 128, 'limit' => 1, 'label' => $RCMAIL->gettext('jobtitle'), 'category' => 'main'),
	'organization' => array('type' => 'text', 'size' => 40, 'maxlength' => 128, 'limit' => 1, 'label' => $RCMAIL->gettext('organization'), 'category' => 'main'),
	'department' => array('type' => 'text', 'size' => 40, 'maxlength' => 128, 'limit' => 1, 'label' => $RCMAIL->gettext('department'), 'category' => 'main'),
	'gender' => array('type' => 'select', 'limit' => 1, 'label' => $RCMAIL->gettext('gender'), 'options' => array('male' => $RCMAIL->gettext('male'), 'female' => $RCMAIL->gettext('female')), 'category' => 'personal'),
	'maidenname' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => $RCMAIL->gettext('maidenname'), 'category' => 'personal'),
	'phone' => array('type' => 'text', 'size' => 40, 'maxlength' => 20, 'label' => $RCMAIL->gettext('phone'), 'subtypes' => array('home','home2','work','work2','mobile','main','homefax','workfax','car','pager','video','assistant','other'), 'category' => 'main'),
	'address' => array('type' => 'composite', 'label' => $RCMAIL->gettext('address'), 'subtypes' => array('home','work','other'), 'childs' => array(
	'street' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => $RCMAIL->gettext('street'), 'category' => 'main'),
	'locality' => array('type' => 'text', 'size' => 28, 'maxlength' => 50, 'label' => $RCMAIL->gettext('locality'), 'category' => 'main'),
	'zipcode' => array('type' => 'text', 'size' => 8, 'maxlength' => 15, 'label' => $RCMAIL->gettext('zipcode'), 'category' => 'main'),
	'region' => array('type' => 'text', 'size' => 12, 'maxlength' => 50, 'label' => $RCMAIL->gettext('region'), 'category' => 'main'),
	'country' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => $RCMAIL->gettext('country'), 'category' => 'main'),
	), 'category' => 'main'),
	'birthday' => array('type' => 'date', 'size' => 12, 'maxlength' => 16, 'label' => $RCMAIL->gettext('birthday'), 'limit' => 1, 'render_func' => 'rcmail_format_date_col', 'category' => 'personal'),
	'anniversary' => array('type' => 'date', 'size' => 12, 'maxlength' => 16, 'label' => $RCMAIL->gettext('anniversary'), 'limit' => 1, 'render_func' => 'rcmail_format_date_col', 'category' => 'personal'),
	'website' => array('type' => 'text', 'size' => 40, 'maxlength' => 128, 'label' => $RCMAIL->gettext('website'), 'subtypes' => array('homepage','work','blog','profile','other'), 'category' => 'main'),
	'im' => array('type' => 'text', 'size' => 40, 'maxlength' => 128, 'label' => $RCMAIL->gettext('instantmessenger'), 'subtypes' => array('aim','icq','msn','yahoo','jabber','skype','other'), 'category' => 'main'),
	'notes' => array('type' => 'textarea', 'size' => 40, 'rows' => 15, 'maxlength' => 500, 'label' => $RCMAIL->gettext('notes'), 'limit' => 1),
	'photo' => array('type' => 'image', 'limit' => 1, 'category' => 'main'),
	'assistant' => array('type' => 'text', 'size' => 40, 'maxlength' => 128, 'limit' => 1, 'label' => $RCMAIL->gettext('assistant'), 'category' => 'personal'),
	'manager' => array('type' => 'text', 'size' => 40, 'maxlength' => 128, 'limit' => 1, 'label' => $RCMAIL->gettext('manager'), 'category' => 'personal'),
	'spouse' => array('type' => 'text', 'size' => 40, 'maxlength' => 128, 'limit' => 1, 'label' => $RCMAIL->gettext('spouse'), 'category' => 'personal'),
	// TODO: define fields for vcards like GEO, KEY
	);

	$PAGE_SIZE = $RCMAIL->config->get('addressbook_pagesize', $RCMAIL->config->get('pagesize', 50));

	// Addressbook UI
	if (!$RCMAIL->action && !$OUTPUT->ajax_call) {
	// add list of address sources to client env
	$js_list = $RCMAIL->get_address_sources();

	// count all/writeable sources
	$writeable = 0;
	$count = 0;

	foreach ($js_list as $sid => $s) {
	$count++;
	if (!$s['readonly']) {
	$writeable++;
	}
	// unset hidden sources
	if ($s['hidden']) {
	unset($js_list[$sid]);
	}
	}

	$OUTPUT->set_env('display_next', (bool) $RCMAIL->config->get('display_next'));
	$OUTPUT->set_env('search_mods', $RCMAIL->config->get('addressbook_search_mods', $SEARCH_MODS_DEFAULT));
	$OUTPUT->set_env('address_sources', $js_list);
	$OUTPUT->set_env('writable_source', $writeable);
	$OUTPUT->set_env('contact_move_enabled', $writeable > 1);
	$OUTPUT->set_env('contact_copy_enabled', $writeable > 1 \|\| ($writeable == 1 && count($js_list) > 1));

	$OUTPUT->set_pagetitle($RCMAIL->gettext('contacts'));

	$_SESSION['addressbooks_count'] = $count;
	$_SESSION['addressbooks_count_writeable'] = $writeable;

	// select address book
	$source = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);

	// use first directory by default
	if (!strlen($source) \|\| !isset($js_list[$source])) {
	$source = $RCMAIL->config->get('default_addressbook');
	if (!strlen($source) \|\| !isset($js_list[$source])) {
	$source = strval(key($js_list));
	}
	}

	$CONTACTS = rcmail_contact_source($source, true);
	}

	// remove undo information...
	if ($undo = $_SESSION['contact_undo']) {
	// ...after timeout
	$undo_time = $RCMAIL->config->get('undo_timeout', 0);
	if ($undo['ts'] < time() - $undo_time)
	$RCMAIL->session->remove('contact_undo');
	}

	// register UI objects
	$OUTPUT->add_handlers(array(
	'directorylist' => 'rcmail_directory_list',
	'savedsearchlist' => 'rcmail_savedsearch_list',
	'addresslist' => 'rcmail_contacts_list',
	'addresslisttitle' => 'rcmail_contacts_list_title',
	'recordscountdisplay' => 'rcmail_rowcount_display',
	'searchform' => array($OUTPUT, 'search_form')
	));

	// register action aliases
	$RCMAIL->register_action_map(array(
	'add' => 'edit.inc',
	'group-create' => 'groups.inc',
	'group-rename' => 'groups.inc',
	'group-delete' => 'groups.inc',
	'group-addmembers' => 'groups.inc',
	'group-delmembers' => 'groups.inc',
	'search-create' => 'search.inc',
	'search-delete' => 'search.inc',
	));

	// Disable qr-code if php-gd or Endroid's QrCode is not installed
	if (!$OUTPUT->ajax_call) {
	$OUTPUT->set_env('qrcode', function_exists('imagecreate') && class_exists('Endroid\QrCode\QrCode'));
	$OUTPUT->add_label('qrcode');
	}


	// instantiate a contacts object according to the given source
	function rcmail_contact_source($source=null, $init_env=false, $writable=false)
	{
	global $RCMAIL, $OUTPUT, $CONTACT_COLTYPES, $PAGE_SIZE;

	if (!strlen($source)) {
	$source = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);
	}

	// Get object
	$CONTACTS = $RCMAIL->get_address_book($source, $writable);
	$CONTACTS->set_pagesize($PAGE_SIZE);

	// set list properties and session vars
	if (!empty($_GET['_page']))
	$CONTACTS->set_page(($_SESSION['page'] = intval($_GET['_page'])));
	else
	$CONTACTS->set_page(isset($_SESSION['page']) ? $_SESSION['page'] : 1);

	if ($group = rcube_utils::get_input_value('_gid', rcube_utils::INPUT_GP)) {
	$CONTACTS->set_group($group);
	}

	if (!$init_env) {
	return $CONTACTS;
	}

	$OUTPUT->set_env('readonly', $CONTACTS->readonly);
	$OUTPUT->set_env('source', (string) $source);
	$OUTPUT->set_env('group', $group);

	// reduce/extend $CONTACT_COLTYPES with specification from the current $CONTACT object
	if (is_array($CONTACTS->coltypes)) {
	// remove cols not listed by the backend class
	$contact_cols = $CONTACTS->coltypes[0] ? array_flip($CONTACTS->coltypes) : $CONTACTS->coltypes;
	$CONTACT_COLTYPES = array_intersect_key($CONTACT_COLTYPES, $contact_cols);
	// add associative coltypes definition
	if (!$CONTACTS->coltypes[0]) {
	foreach ($CONTACTS->coltypes as $col => $colprop) {
	if (is_array($colprop['childs'])) {
	foreach ($colprop['childs'] as $childcol => $childprop)
	$colprop['childs'][$childcol] = array_merge((array)$CONTACT_COLTYPES[$col]['childs'][$childcol], $childprop);
	}
	$CONTACT_COLTYPES[$col] = $CONTACT_COLTYPES[$col] ? array_merge($CONTACT_COLTYPES[$col], $colprop) : $colprop;
	}
	}
	}

	$OUTPUT->set_env('photocol', is_array($CONTACT_COLTYPES['photo']));

	return $CONTACTS;
	}


	function rcmail_set_sourcename($abook)
	{
	global $OUTPUT, $RCMAIL;

	// get address book name (for display)
	if ($abook && $_SESSION['addressbooks_count'] > 1) {
	$name = $abook->get_name();
	if (!$name) {
	$name = $RCMAIL->gettext('personaladrbook');
	}
	$OUTPUT->set_env('sourcename', html_entity_decode($name, ENT_COMPAT, 'UTF-8'));
	}
	}


	function rcmail_directory_list($attrib)
	{
	global $RCMAIL, $OUTPUT;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmdirectorylist';

	$out = '';
	$jsdata = array();

	$line_templ = html::tag('li', array(
	'id' => 'rcmli%s', 'class' => '%s', 'noclose' => true),
	html::a(array('href' => '%s',
	'rel' => '%s',
	'onclick' => "return ".rcmail_output::JS_OBJECT_NAME.".command('list','%s',this)"), '%s'));

	$sources = (array) $OUTPUT->get_env('address_sources');
	reset($sources);

	// currently selected source
	$current = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);

	foreach ($sources as $j => $source) {
	$id = strval(strlen($source['id']) ? $source['id'] : $j);
	$js_id = rcube::JQ($id);

	// set class name(s)
	$class_name = 'addressbook';
	if ($current === $id)
	$class_name .= ' selected';
	if ($source['readonly'])
	$class_name .= ' readonly';
	if ($source['class_name'])
	$class_name .= ' ' . $source['class_name'];

	$name = $source['name'] ?: $id;
	$out .= sprintf($line_templ,
	rcube_utils::html_identifier($id, true),
	$class_name,
	rcube::Q($RCMAIL->url(array('_source' => $id))),
	$source['id'],
	$js_id, $name);

	$groupdata = array('out' => $out, 'jsdata' => $jsdata, 'source' => $id);
	if ($source['groups'])
	$groupdata = rcmail_contact_groups($groupdata);
	$jsdata = $groupdata['jsdata'];
	$out = $groupdata['out'];
	$out .= '</li>';
	}

	$OUTPUT->set_env('contactgroups', $jsdata);
	$OUTPUT->set_env('collapsed_abooks', (string)$RCMAIL->config->get('collapsed_abooks',''));
	$OUTPUT->add_gui_object('folderlist', $attrib['id']);
	$OUTPUT->include_script('treelist.js');

	// add some labels to client
	$OUTPUT->add_label('deletegroupconfirm', 'groupdeleting', 'addingmember', 'removingmember',
	'newgroup', 'grouprename', 'searchsave', 'namex', 'save', 'import', 'importcontacts',
	'advsearch', 'search'
	);

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


	function rcmail_savedsearch_list($attrib)
	{
	global $RCMAIL, $OUTPUT;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmsavedsearchlist';

	$out = '';
	$line_templ = html::tag('li', array(
	'id' => 'rcmli%s', 'class' => '%s'),
	html::a(array('href' => '#', 'rel' => 'S%s',
	'onclick' => "return ".rcmail_output::JS_OBJECT_NAME.".command('listsearch', '%s', this)"), '%s'));

	// Saved searches
	$sources = $RCMAIL->user->list_searches(rcube_user::SEARCH_ADDRESSBOOK);
	foreach ($sources as $source) {
	$id = $source['id'];
	$js_id = rcube::JQ($id);

	// set class name(s)
	$classes = array('contactsearch');
	if (!empty($source['class_name']))
	$classes[] = $source['class_name'];

	$out .= sprintf($line_templ,
	rcube_utils::html_identifier('S'.$id, true),
	join(' ', $classes),
	$id,
	$js_id, rcube::Q($source['name'] ?: $id)
	);
	}

	$OUTPUT->add_gui_object('savedsearchlist', $attrib['id']);

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


	function rcmail_contact_groups($args)
	{
	global $RCMAIL;

	$groups_html = '';
	$groups = $RCMAIL->get_address_book($args['source'])->list_groups();

	if (!empty($groups)) {
	$line_templ = html::tag('li', array(
	'id' => 'rcmli%s', 'class' => 'contactgroup'),
	html::a(array('href' => '#',
	'rel' => '%s:%s',
	'onclick' => "return ".rcmail_output::JS_OBJECT_NAME.".command('listgroup',{'source':'%s','id':'%s'},this)"), '%s'));

	// append collapse/expand toggle and open a new <ul>
	$is_collapsed = strpos($RCMAIL->config->get('collapsed_abooks',''), '&'.rawurlencode($args['source']).'&') !== false;
	$args['out'] .= html::div('treetoggle ' . ($is_collapsed ? 'collapsed' : 'expanded'), ' ');

	foreach ($groups as $group) {
	$groups_html .= sprintf($line_templ,
	rcube_utils::html_identifier('G' . $args['source'] . $group['ID'], true),
	$args['source'], $group['ID'],
	$args['source'], $group['ID'], rcube::Q($group['name'])
	);
	$args['jsdata']['G'.$args['source'].$group['ID']] = array(
	'source' => $args['source'], 'id' => $group['ID'],
	'name' => $group['name'], 'type' => 'group');
	}
	}

	$args['out'] .= html::tag('ul',
	array('class' => 'groups', 'style' => ($is_collapsed \|\| empty($groups) ? "display:none;" : null)),
	$groups_html);

	return $args;
	}


	// return the contacts list as HTML table
	function rcmail_contacts_list($attrib)
	{
	global $RCMAIL, $CONTACTS, $OUTPUT;

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

	// add id to message list table if not specified
	if (!strlen($attrib['id']))
	$attrib['id'] = 'rcmAddressList';

	// create XHTML table
	$out = $RCMAIL->table_output($attrib, array(), $a_show_cols, $CONTACTS->primary_key);

	// set client env
	$OUTPUT->add_gui_object('contactslist', $attrib['id']);
	$OUTPUT->set_env('current_page', (int)$CONTACTS->list_page);
	$OUTPUT->include_script('list.js');

	// add some labels to client
	$OUTPUT->add_label('deletecontactconfirm', 'copyingcontact', 'movingcontact', 'contactdeleting');

	return $out;
	}


	function rcmail_js_contacts_list($result, $prefix='')
	{
	global $OUTPUT, $RCMAIL;

	if (empty($result) \|\| $result->count == 0) {
	return;
	}

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

	while ($row = $result->next()) {
	$emails = rcube_addressbook::get_col_values('email', $row, true);
	$row['CID'] = $row['ID'];
	$row['email'] = reset($emails);

	$source_id = $OUTPUT->get_env('source');
	$a_row_cols = array();
	$classes = array($row['_type'] ?: 'person');

	// build contact ID with source ID
	if (isset($row['sourceid'])) {
	$row['ID'] = $row['ID'].'-'.$row['sourceid'];
	$source_id = $row['sourceid'];
	}

	// format each col
	foreach ($a_show_cols as $col) {
	$val = '';
	switch ($col) {
	case 'name':
	$val = rcube::Q(rcube_addressbook::compose_list_name($row));
	break;

	case 'action':
	if ($row['_type'] == 'group') {
	$val = html::a(array(
	'href' => '#list',
	'rel' => $row['ID'],
	'title' => $RCMAIL->gettext('listgroup'),
	'onclick' => sprintf("return %s.command('pushgroup',{'source':'%s','id':'%s'},this,event)", rcmail_output::JS_OBJECT_NAME, $source_id, $row['CID']),
	'class' => 'pushgroup',
	'data-action-link' => true,
	), '»');
	}
	else
	$val = '';
	break;

	default:
	$val = rcube::Q($row[$col]);
	break;
	}

	$a_row_cols[$col] = $val;
	}

	if ($row['readonly'])
	$classes[] = 'readonly';

	$OUTPUT->command($prefix.'add_contact_row', $row['ID'], $a_row_cols, join(' ', $classes), array_intersect_key($row, array('ID'=>1,'readonly'=>1,'_type'=>1,'email'=>1,'name'=>1)));
	}
	}


	function rcmail_contacts_list_title($attrib)
	{
	global $OUTPUT, $RCMAIL;

	$attrib += array('label' => 'contacts', 'id' => 'rcmabooklisttitle', 'tag' => 'span');
	unset($attrib['name']);

	$OUTPUT->add_gui_object('addresslist_title', $attrib['id']);
	$OUTPUT->add_label('contacts','uponelevel');

	return html::tag($attrib['tag'], $attrib, $RCMAIL->gettext($attrib['label']), html::$common_attrib);
	}


	function rcmail_rowcount_display($attrib)
	{
	global $RCMAIL;

	if (!$attrib['id'])
	$attrib['id'] = 'rcmcountdisplay';

	$RCMAIL->output->add_gui_object('countdisplay', $attrib['id']);

	if ($attrib['label'])
	$_SESSION['contactcountdisplay'] = $attrib['label'];

	return html::span($attrib, $RCMAIL->gettext('loading'));
	}


	function rcmail_get_rowcount_text($result=null)
	{
	global $RCMAIL, $CONTACTS, $PAGE_SIZE;

	// read nr of contacts
	if (!$result) {
	$result = $CONTACTS->get_result();
	}

	if ($result->count == 0)
	$out = $RCMAIL->gettext('nocontactsfound');
	else
	$out = $RCMAIL->gettext(array(
	'name' => $_SESSION['contactcountdisplay'] ?: 'contactsfromto',
	'vars' => array(
	'from' => $result->first + 1,
	'to' => min($result->count, $result->first + $PAGE_SIZE),
	'count' => $result->count)
	));

	return $out;
	}


	function rcmail_get_type_label($type)
	{
	global $RCMAIL;

	$label = 'type'.$type;
	if ($RCMAIL->text_exists($label, '*', $domain))
	return $RCMAIL->gettext($label, $domain);
	else if (preg_match('/\w+(\d+)$/', $label, $m)
	&& ($label = preg_replace('/(\d+)$/', '', $label))
	&& $RCMAIL->text_exists($label, '*', $domain))
	return $RCMAIL->gettext($label, $domain) . ' ' . $m[1];

	return ucfirst($type);
	}


	function rcmail_contact_form($form, $record, $attrib = null)
	{
	global $RCMAIL;

	// group fields
	$head_fields = array(
	'source' => array('source'),
	'names' => array('prefix','firstname','middlename','surname','suffix'),
	'displayname' => array('name'),
	'nickname' => array('nickname'),
	'organization' => array('organization'),
	'department' => array('department'),
	'jobtitle' => array('jobtitle'),
	);

	// Allow plugins to modify contact form content
	$plugin = $RCMAIL->plugins->exec_hook('contact_form', array(
	'form' => $form, 'record' => $record, 'head_fields' => $head_fields));

	$form = $plugin['form'];
	$record = $plugin['record'];
	$head_fields = $plugin['head_fields'];
	$edit_mode = $RCMAIL->action != 'show' && $RCMAIL->action != 'print';
	$compact = rcube_utils::get_boolean($attrib['compact-form']);
	$use_labels = rcube_utils::get_boolean($attrib['use-labels']);
	$with_source = rcube_utils::get_boolean($attrib['with-source']);
	$out = '';

	if ($attrib['deleteicon']) {
	$del_button = html::img(array('src' => $RCMAIL->output->get_skin_file($attrib['deleteicon']), 'alt' => $RCMAIL->gettext('delete')));
	}
	else {
	$del_button = html::span('inner', $RCMAIL->gettext('delete'));
	}

	unset($attrib['deleteicon']);

	// get default coltypes
	$coltypes = $GLOBALS['CONTACT_COLTYPES'];
	$coltype_labels = array();

	foreach ($coltypes as $col => $prop) {
	if ($prop['subtypes']) {
	$subtype_names = array_map('rcmail_get_type_label', $prop['subtypes']);
	$select_subtype = new html_select(array('name' => '_subtype_'.$col.'[]', 'class' => 'contactselectsubtype custom-select', 'title' => $prop['label'] . ' ' . $RCMAIL->gettext('type')));
	$select_subtype->add($subtype_names, $prop['subtypes']);
	$coltypes[$col]['subtypes_select'] = $select_subtype->show();
	}
	if ($prop['childs']) {
	foreach ($prop['childs'] as $childcol => $cp)
	$coltype_labels[$childcol] = array('label' => $cp['label']);
	}
	}

	foreach ($form as $section => $fieldset) {
	// skip empty sections
	if (empty($fieldset['content'])) {
	continue;
	}

	$select_add = new html_select(array('class' => 'addfieldmenu', 'rel' => $section, 'data-compact' => $compact ? "true" : null));
	$select_add->add($RCMAIL->gettext('addfield'), '');

	// render head section with name fields (not a regular list of rows)
	if ($section == 'head') {
	$content = '';

	// unset display name if it is composed from name parts
	if ($record['name'] == rcube_addressbook::compose_display_name(array('name' => '') + (array)$record)) {
	unset($record['name']);
	}

	foreach ($head_fields as $blockname => $colnames) {
	$fields = '';
	$block_attr = array('class' => $blockname . (count($colnames) == 1 ? ' row' : ''));

	foreach ($colnames as $col) {
	if ($col == 'source') {
	if (!$with_source \|\| !($source = $RCMAIL->output->get_env('sourcename'))) {
	continue;
	}

	if (!$edit_mode) {
	$record['source'] = $RCMAIL->gettext('addressbook') . ': ' . $source;
	}
	else if ($RCMAIL->action == 'add') {
	$record['source'] = $source;
	}
	else {
	continue;
	}
	}
	// skip cols unknown to the backend
	else if (!$coltypes[$col]) {
	continue;
	}

	// skip cols not listed in the form definition
	if (is_array($fieldset['content']) && !in_array($col, array_keys($fieldset['content']))) {
	continue;
	}

	// only string values are expected here
	if (is_array($record[$col])) {
	$record[$col] = join(' ', $record[$col]);
	}

	if (!$edit_mode) {
	if (!empty($record[$col])) {
	$fields .= html::span('namefield ' . $col, rcube::Q($record[$col])) . ' ';
	}
	}
	else {
	$colprop = (array)$fieldset['content'][$col] + (array)$coltypes[$col];
	$visible = true;

	if (empty($colprop['id'])) {
	$colprop['id'] = 'ff_' . $col;
	}

	if (empty($record[$col]) && !$colprop['visible']) {
	$visible = false;
	$colprop['style'] = $use_labels ? null : 'display:none';
	$select_add->add($colprop['label'], $col);
	}

	if ($col == 'source') {
	$input = rcmail_source_selector(array('id' => $colprop['id']));
	}
	else {
	$input = rcube_output::get_edit_field($col, $record[$col], $colprop, $colprop['type']);
	}

	if ($use_labels) {
	$_content = html::label($colprop['id'], rcube::Q($colprop['label'])) . html::div(null, $input);
	if (count($colnames) > 1) {
	$fields .= html::div(array('class' => 'row', 'style' => $visible ? null : 'display:none'), $_content);
	}
	else {
	$fields .= $_content;
	$block_attr['style'] = $visible ? null : 'display:none';
	}
	}
	else {
	$fields .= $input;
	}
	}
	}

	if ($fields) {
	$content .= html::div($block_attr, $fields);
	}
	}

	if ($edit_mode) {
	$content .= html::p('addfield', $select_add->show(null));
	}

	$legend = !empty($fieldset['name']) ? html::tag('legend', null, rcube::Q($fieldset['name'])) : '';
	$out .= html::tag('fieldset', $attrib, $legend . $content, html::$common_attrib) ."\n";
	continue;
	}

	$content = '';
	if (is_array($fieldset['content'])) {
	foreach ($fieldset['content'] as $col => $colprop) {
	// remove subtype part of col name
	list($field, $subtype) = explode(':', $col);
	if (!$subtype) $subtype = 'home';
	$fullkey = $col.':'.$subtype;

	// skip cols unknown to the backend
	if (!$coltypes[$field] && empty($colprop['value'])) {
	continue;
	}

	// merge colprop with global coltype configuration
	if ($coltypes[$field]) {
	$colprop += $coltypes[$field];
	}

	$label = isset($colprop['label']) ? $colprop['label'] : $RCMAIL->gettext($col);

	// prepare subtype selector in edit mode
	if ($edit_mode && is_array($colprop['subtypes'])) {
	$subtype_names = array_map('rcmail_get_type_label', $colprop['subtypes']);
	$select_subtype = new html_select(array('name' => '_subtype_'.$col.'[]', 'class' => 'contactselectsubtype', 'title' => $colprop['label'] . ' ' . $RCMAIL->gettext('type')));
	$select_subtype->add($subtype_names, $colprop['subtypes']);
	}
	else {
	$select_subtype = null;
	}

	if (!empty($colprop['value'])) {
	$values = (array)$colprop['value'];
	}
	else {
	// iterate over possible subtypes and collect values with their subtype
	if (is_array($colprop['subtypes'])) {
	$values = $subtypes = array();
	foreach (rcube_addressbook::get_col_values($field, $record) as $st => $vals) {
	foreach ((array)$vals as $value) {
	$i = count($values);
	$subtypes[$i] = $st;
	$values[$i] = $value;
	}
	// TODO: add $st to $select_subtype if missing ?
	}
	}
	else {
	$values = $record[$fullkey] ?: $record[$field];
	$subtypes = null;
	}
	}

	// hack: create empty values array to force this field to be displayed
	if (empty($values) && $colprop['visible']) {
	$values = array('');
	}

	if (!is_array($values)) {
	// $values can be an object, don't use (array)$values syntax
	$values = !empty($values) ? array($values) : array();
	}

	$rows = '';
	foreach ($values as $i => $val) {
	if ($subtypes[$i]) {
	$subtype = $subtypes[$i];
	}

	$colprop['id'] = 'ff_' . $col . intval($coltypes[$field]['count']);
	$row_class = 'row';

	// render composite field
	if ($colprop['type'] == 'composite') {
	$row_class .= ' composite';
	$composite = array();
	$template = $RCMAIL->config->get($col . '_template', '{'.join('} {', array_keys($colprop['childs'])).'}');
	$j = 0;

	foreach ($colprop['childs'] as $childcol => $cp) {
	if (!empty($val) && is_array($val)) {
	$childvalue = $val[$childcol] ?: $val[$j];
	}
	else {
	$childvalue = '';
	}

	if ($edit_mode) {
	if ($colprop['subtypes'] \|\| $colprop['limit'] != 1) $cp['array'] = true;
	$composite['{'.$childcol.'}'] = rcube_output::get_edit_field($childcol, $childvalue, $cp, $cp['type']) . ' ';
	}
	else {
	$childval = $cp['render_func'] ? call_user_func($cp['render_func'], $childvalue, $childcol) : rcube::Q($childvalue);
	$composite['{'.$childcol.'}'] = html::span('data ' . $childcol, $childval) . ' ';
	}
	$j++;
	}

	$coltypes[$field] += (array)$colprop;
	$coltypes[$field]['count']++;
	$val = preg_replace('/\{\w+\}/', '', strtr($template, $composite));

	if ($compact) {
	$val = html::div('content', str_replace('<br/>', '', $val));
	}
	}
	else if ($edit_mode) {
	// call callback to render/format value
	if ($colprop['render_func']) {
	$val = call_user_func($colprop['render_func'], $val, $col);
	}

	$coltypes[$field] = (array)$colprop + $coltypes[$field];

	if ($colprop['subtypes'] \|\| $colprop['limit'] != 1) {
	$colprop['array'] = true;
	}

	// load jquery UI datepicker for date fields
	if ($colprop['type'] == 'date') {
	$colprop['class'] .= ($colprop['class'] ? ' ' : '') . 'datepicker';
	if (!$colprop['render_func']) {
	$val = rcmail_format_date_col($val);
	}
	}

	$val = rcube_output::get_edit_field($col, $val, $colprop, $colprop['type']);
	$coltypes[$field]['count']++;
	}
	else if ($colprop['render_func']) {
	$val = call_user_func($colprop['render_func'], $val, $col);
	}
	else if (is_array($colprop['options']) && isset($colprop['options'][$val])) {
	$val = $colprop['options'][$val];
	}
	else {
	$val = rcube::Q($val);
	}

	// use subtype as label
	if ($colprop['subtypes']) {
	$label = rcmail_get_type_label($subtype);
	}

	$_del_btn = html::a(array('href' => '#del', 'class' => 'contactfieldbutton deletebutton', 'title' => $RCMAIL->gettext('delete'), 'rel' => $col), $del_button);

	// add delete button/link
	if (!$compact && $edit_mode && !($colprop['visible'] && $colprop['limit'] == 1)) {
	$val .= $_del_btn;
	}

	// display row with label
	if ($label) {
	if ($RCMAIL->action == 'print') {
	$_label = rcube::Q($colprop['label'] . ($label != $colprop['label'] ? ' (' . $label . ')' : ''));
	if (!$compact) {
	$_label = html::div('contactfieldlabel label', $_label);
	}
	}
	else if ($select_subtype) {
	$_label = $select_subtype->show($subtype);
	if (!$compact) {
	$_label = html::div('contactfieldlabel label', $_label);
	}
	}
	else {
	$_label = html::label(array('class' => 'contactfieldlabel label', 'for' => $colprop['id']), rcube::Q($label));
	}

	if (!$compact) {
	$val = html::div('contactfieldcontent ' . $colprop['type'], $val);
	}
	else {
	$val .= $_del_btn;
	}

	$rows .= html::div($row_class, $_label . $val);
	}
	// row without label
	else {
	$rows .= html::div($row_class, $compact ? $val : html::div('contactfield', $val));
	}
	}

	// add option to the add-field menu
	if (!$colprop['limit'] \|\| $coltypes[$field]['count'] < $colprop['limit']) {
	$select_add->add($colprop['label'], $col);
	$select_add->_count++;
	}

	// wrap rows in fieldgroup container
	if ($rows) {
	$c_class = 'contactfieldgroup ' . ($colprop['subtypes'] ? 'contactfieldgroupmulti ' : '') . 'contactcontroller' . $col;
	$with_label = $colprop['subtypes'] && $RCMAIL->action != 'print';
	$content .= html::tag(
	'fieldset',
	array('class' => $c_class, 'style' => ($rows ? null : 'display:none')),
	($with_label ? html::tag('legend', null, rcube::Q($colprop['label'])) : ' ') . $rows
	);
	}
	}

	if (!$content && (!$edit_mode \|\| !$select_add->_count)) {
	continue;
	}

	// also render add-field selector
	if ($edit_mode) {
	$content .= html::p('addfield', $select_add->show(null, array('style' => $select_add->_count ? null : 'display:none')));
	}

	$content = html::div(array('id' => 'contactsection' . $section), $content);
	}
	else {
	$content = $fieldset['content'];
	}

	if ($content) {
	$out .= html::tag('fieldset', array('class' => $attrib['fieldset-class']),
	html::tag('legend', null, rcube::Q($fieldset['name'])) . $content) . "\n";
	}
	}

	if ($edit_mode) {
	$RCMAIL->output->set_env('coltypes', $coltypes + $coltype_labels);
	$RCMAIL->output->set_env('delbutton', $del_button);
	$RCMAIL->output->add_label('delete');
	}

	return $out;
	}


	function rcmail_contact_photo($attrib)
	{
	global $SOURCE_ID, $CONTACTS, $CONTACT_COLTYPES, $RCMAIL;

	if ($result = $CONTACTS->get_result()) {
	$record = $result->first();
	}

	if ($record['_type'] == 'group' && $attrib['placeholdergroup']) {
	$photo_img = $RCMAIL->output->abs_url($attrib['placeholdergroup'], true);
	}
	else {
	$photo_img = $attrib['placeholder'] ? $RCMAIL->output->abs_url($attrib['placeholder'], true) : 'program/resources/blank.gif';
	}

	$photo_img = $RCMAIL->output->asset_url($photo_img);

	$RCMAIL->output->set_env('photo_placeholder', $photo_img);

	unset($attrib['placeholder']);

	$plugin = $RCMAIL->plugins->exec_hook('contact_photo', array('record' => $record, 'data' => $record['photo']));

	// check if we have photo data from contact form
	if ($GLOBALS['EDIT_RECORD']) {
	$rec = $GLOBALS['EDIT_RECORD'];
	if ($rec['photo'] == '-del-') {
	$record['photo'] = '';
	}
	else if ($_SESSION['contacts']['files'][$rec['photo']]) {
	$record['photo'] = $file_id = $rec['photo'];
	}
	}

	if ($plugin['url'])
	$photo_img = $plugin['url'];
	else if (preg_match('!^https?://!i', $record['photo']))
	$photo_img = $record['photo'];
	else if ($record['photo']) {
	$url = array('_action' => 'photo', '_cid' => $record['ID'], '_source' => $SOURCE_ID);
	if ($file_id) {
	$url['_photo'] = $ff_value = $file_id;
	}
	$photo_img = $RCMAIL->url($url);
	}
	else {
	$ff_value = '-del-'; // will disable delete-photo action
	}

	$content = html::div($attrib, html::img(array(
	'src' => $photo_img,
	'alt' => $RCMAIL->gettext('contactphoto'),
	'onerror' => 'this.src = rcmail.env.photo_placeholder; this.onerror = null',
	)));

	if ($CONTACT_COLTYPES['photo'] && ($RCMAIL->action == 'edit' \|\| $RCMAIL->action == 'add')) {
	$RCMAIL->output->add_gui_object('contactphoto', $attrib['id']);
	$hidden = new html_hiddenfield(array('name' => '_photo', 'id' => 'ff_photo', 'value' => $ff_value));
	$content .= $hidden->show();
	}

	return $content;
	}


	function rcmail_format_date_col($val)
	{
	global $RCMAIL;
	return $RCMAIL->format_date($val, $RCMAIL->config->get('date_format', 'Y-m-d'), false);
	}

	/**
	* Updates saved search after data changed
	*/
	function rcmail_search_update($return = false)
	{
	global $RCMAIL;

	- if (($search_request = $_REQUEST['_search']) && isset($_SESSION['search'][$search_request])) {
	- $search = (array)$_SESSION['search'][$search_request];
	+ if (($search_request = $_REQUEST['_search']) && isset($_SESSION['contact_search'][$search_request])
	+ && is_array($_SESSION['contact_search'][$search_request])
	+ ) {
	+ $search = $_SESSION['contact_search'][$search_request];
	$sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');
	$afields = $return ? $RCMAIL->config->get('contactlist_fields') : array('name', 'email');
	$records = array();

	foreach ($search as $s => $set) {
	$source = $RCMAIL->get_address_book($s);

	// reset page
	$source->set_page(1);
	$source->set_pagesize(9999);
	$source->set_search_set($set);

	// get records
	$result = $source->list_records($afields);

	if (!$result->count) {
	unset($search[$s]);
	continue;
	}

	if ($return) {
	while ($row = $result->next()) {
	$row['sourceid'] = $s;
	$key = rcube_addressbook::compose_contact_key($row, $sort_col);
	$records[$key] = $row;
	}
	unset($result);
	}

	$search[$s] = $source->get_search_set();
	}

	- $_SESSION['search'][$search_request] = $search;
	+ $_SESSION['contact_search'][$search_request] = $search;

	return $records;
	}

	return false;
	}

	/**
	* Returns contact ID(s) and source(s) from GET/POST data
	*
	* @return array List of contact IDs per-source
	*/
	function rcmail_get_cids($filter = null, $request_type = rcube_utils::INPUT_GPC)
	{
	// contact ID (or comma-separated list of IDs) is provided in two
	// forms. If _source is an empty string then the ID is a string
	// containing contact ID and source name in form: <ID>-<SOURCE>

	$cid = rcube_utils::get_input_value('_cid', $request_type);
	$source = (string) rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);

	if (is_array($cid)) {
	return $cid;
	}

	if (!preg_match('/^[a-zA-Z0-9\+\/=_-]+(,[a-zA-Z0-9\+\/=_-]+)*$/', $cid)) {
	return array();
	}

	$cid = explode(',', $cid);
	$got_source = strlen($source);
	$result = array();

	// create per-source contact IDs array
	foreach ($cid as $id) {
	// extract source ID from contact ID (it's there in search mode)
	// see #1488959 and #1488862 for reference
	if (!$got_source) {
	if ($sep = strrpos($id, '-')) {
	$contact_id = substr($id, 0, $sep);
	$source_id = (string) substr($id, $sep+1);
	if (strlen($source_id)) {
	$result[$source_id][] = $contact_id;
	}
	}
	}
	else {
	if (substr($id, -($got_source+1)) === "-$source") {
	$id = substr($id, 0, -($got_source+1));
	}
	$result[$source][] = $id;
	}
	}

	return $filter !== null ? $result[$filter] : $result;
	}
	diff --git a/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc
	index 15af27d67..398b162de 100644
	--- a/program/steps/addressbook/search.inc
	+++ b/program/steps/addressbook/search.inc
	@@ -1,348 +1,347 @@
	<?php

	/**
	+-----------------------------------------------------------------------+
	\| This file is part of the Roundcube Webmail client \|
	\| \|
	\| Copyright (C) The Roundcube Dev Team \|
	\| Copyright (C) Kolab Systems AG \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Search action (and form) for address book contacts \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	\| Author: Aleksander Machniak <machniak@kolabsys.com> \|
	+-----------------------------------------------------------------------+
	*/

	if ($RCMAIL->action == 'search-create') {
	$id = rcube_utils::get_input_value('_search', rcube_utils::INPUT_POST);
	$name = rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST, true);

	- if (($params = $_SESSION['search_params']) && $params['id'] == $id) {
	-
	+ if (($params = $_SESSION['contact_search_params']) && $params['id'] == $id) {
	$data = array(
	'type' => rcube_user::SEARCH_ADDRESSBOOK,
	'name' => $name,
	'data' => array(
	'fields' => $params['data'][0],
	'search' => $params['data'][1],
	),
	);

	$plugin = $RCMAIL->plugins->exec_hook('saved_search_create', array('data' => $data));

	if (!$plugin['abort'])
	$result = $RCMAIL->user->insert_search($plugin['data']);
	else
	$result = $plugin['result'];
	}

	if ($result) {
	$OUTPUT->show_message('savedsearchcreated', 'confirmation');
	$OUTPUT->command('insert_saved_search', rcube::Q($name), rcube::Q($result));
	}
	else
	$OUTPUT->show_message($plugin['message'] ?: 'savedsearchcreateerror', 'error');

	$OUTPUT->send();
	}

	if ($RCMAIL->action == 'search-delete') {
	$id = rcube_utils::get_input_value('_sid', rcube_utils::INPUT_POST);

	$plugin = $RCMAIL->plugins->exec_hook('saved_search_delete', array('id' => $id));

	if (!$plugin['abort'])
	$result = $RCMAIL->user->delete_search($id);
	else
	$result = $plugin['result'];

	if ($result) {
	$OUTPUT->show_message('savedsearchdeleted', 'confirmation');
	$OUTPUT->command('remove_search_item', rcube::Q($id));
	// contact list will be cleared, clear also page counter
	$OUTPUT->command('set_rowcount', $RCMAIL->gettext('nocontactsfound'));
	$OUTPUT->set_env('pagecount', 0);
	}
	else
	$OUTPUT->show_message($plugin['message'] ?: 'savedsearchdeleteerror', 'error');

	$OUTPUT->send();
	}


	if (!isset($_GET['_form'])) {
	rcmail_contact_search();
	}

	$OUTPUT->add_handler('searchform', 'rcmail_contact_search_form');
	$OUTPUT->send('contactsearch');


	function rcmail_contact_search()
	{
	global $RCMAIL, $OUTPUT, $SEARCH_MODS_DEFAULT, $PAGE_SIZE;

	$adv = isset($_POST['_adv']);
	$sid = rcube_utils::get_input_value('_sid', rcube_utils::INPUT_GET);

	// get search criteria from saved search
	if ($sid && ($search = $RCMAIL->user->get_search($sid))) {
	$fields = $search['data']['fields'];
	$search = $search['data']['search'];
	}
	// get fields/values from advanced search form
	else if ($adv) {
	foreach (array_keys($_POST) as $key) {
	$s = trim(rcube_utils::get_input_value($key, rcube_utils::INPUT_POST, true));
	if (strlen($s) && preg_match('/^_search_([a-zA-Z0-9_-]+)$/', $key, $m)) {
	$search[] = $s;
	$fields[] = $m[1];
	}
	}

	if (empty($fields)) {
	// do nothing, show the form again
	return;
	}
	}
	// quick-search
	else {
	$search = trim(rcube_utils::get_input_value('_q', rcube_utils::INPUT_GET, true));
	$fields = rcube_utils::get_input_value('_headers', rcube_utils::INPUT_GET);

	if (empty($fields)) {
	$fields = array_keys($SEARCH_MODS_DEFAULT);
	}
	else {
	$fields = array_filter(explode(',', $fields));
	}

	// update search_mods setting
	$old_mods = $RCMAIL->config->get('addressbook_search_mods');
	$search_mods = array_fill_keys($fields, 1);
	if ($old_mods != $search_mods) {
	$RCMAIL->user->save_prefs(array('addressbook_search_mods' => $search_mods));
	}

	if (in_array('*', $fields)) {
	$fields = '*';
	}
	}

	// Values matching mode
	$mode = (int) $RCMAIL->config->get('addressbook_search_mode');
	$mode \|= rcube_addressbook::SEARCH_GROUPS;

	// get sources list
	$sources = $RCMAIL->get_address_sources();
	$search_set = array();
	$records = array();
	$sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');
	$afields = $RCMAIL->config->get('contactlist_fields');

	foreach ($sources as $s) {
	$source = $RCMAIL->get_address_book($s['id']);

	// check if search fields are supported....
	if (is_array($fields)) {
	$cols = $source->coltypes[0] ? array_flip($source->coltypes) : $source->coltypes;
	$supported = 0;

	foreach ($fields as $f) {
	if (array_key_exists($f, $cols)) {
	$supported ++;
	}
	}

	// in advanced search we require all fields (AND operator)
	// in quick search we require at least one field (OR operator)
	if (($adv && $supported < count($fields)) \|\| (!$adv && !$supported)) {
	continue;
	}
	}

	// reset page
	$source->set_page(1);
	$source->set_pagesize(9999);

	// get contacts count
	$result = $source->search($fields, $search, $mode, false);

	if (!$result->count) {
	continue;
	}

	// get records
	$result = $source->list_records($afields);

	while ($row = $result->next()) {
	$row['sourceid'] = $s['id'];
	$key = rcube_addressbook::compose_contact_key($row, $sort_col);
	$records[$key] = $row;
	}

	unset($result);
	$search_set[$s['id']] = $source->get_search_set();
	}

	// sort the records
	ksort($records, SORT_LOCALE_STRING);

	// create resultset object
	$count = count($records);
	$result = new rcube_result_set($count);

	// cut first-page records
	if ($PAGE_SIZE < $count) {
	$records = array_slice($records, 0, $PAGE_SIZE);
	}

	$result->records = array_values($records);

	// search request ID
	$search_request = md5('addr'
	.(is_array($fields) ? implode(',', $fields) : $fields)
	.(is_array($search) ? implode(',', $search) : $search));

	// save search settings in session
	- $_SESSION['search'][$search_request] = $search_set;
	- $_SESSION['search_params'] = array('id' => $search_request, 'data' => array($fields, $search));
	+ $_SESSION['contact_search'][$search_request] = $search_set;
	+ $_SESSION['contact_search_params'] = array('id' => $search_request, 'data' => array($fields, $search));
	$_SESSION['page'] = 1;

	if ($adv)
	$OUTPUT->command('list_contacts_clear');

	if ($result->count > 0) {
	// create javascript list
	rcmail_js_contacts_list($result);
	$OUTPUT->show_message('contactsearchsuccessful', 'confirmation', array('nr' => $result->count));
	}
	else {
	$OUTPUT->show_message('nocontactsfound', 'notice');
	}

	// update message count display
	$OUTPUT->set_env('search_request', $search_request);
	$OUTPUT->set_env('pagecount', ceil($result->count / $PAGE_SIZE));
	$OUTPUT->command('set_rowcount', rcmail_get_rowcount_text($result));
	// Re-set current source
	$OUTPUT->set_env('search_id', $sid);
	$OUTPUT->set_env('source', '');
	$OUTPUT->set_env('group', '');
	// Re-set list header
	$OUTPUT->command('set_group_prop', null);

	if (!$sid) {
	// unselect currently selected directory/group
	$OUTPUT->command('unselect_directory');
	// enable "Save search" command
	$OUTPUT->command('enable_command', 'search-create', true);
	}
	$OUTPUT->command('update_group_commands');

	// send response
	$OUTPUT->send();
	}

	function rcmail_contact_search_form($attrib)
	{
	global $RCMAIL, $CONTACT_COLTYPES;

	$i_size = $attrib['size'] ?: 30;
	$short_labels = rcube_utils::get_boolean($attrib['short-legend-labels']);

	$form = array(
	'main' => array(
	'name' => $RCMAIL->gettext('properties'),
	'content' => array(
	),
	),
	'personal' => array(
	'name' => $RCMAIL->gettext($short_labels ? 'personal' : 'personalinfo'),
	'content' => array(
	),
	),
	'other' => array(
	'name' => $RCMAIL->gettext('other'),
	'content' => array(
	),
	),
	);

	// get supported coltypes from all address sources
	$sources = $RCMAIL->get_address_sources();
	$coltypes = array();

	foreach ($sources as $s) {
	$CONTACTS = $RCMAIL->get_address_book($s['id']);

	if (is_array($CONTACTS->coltypes)) {
	$contact_cols = $CONTACTS->coltypes[0] ? array_flip($CONTACTS->coltypes) : $CONTACTS->coltypes;
	$coltypes = array_merge($coltypes, $contact_cols);
	}
	}

	// merge supported coltypes with $CONTACT_COLTYPES
	foreach ($coltypes as $col => $colprop) {
	$coltypes[$col] = $CONTACT_COLTYPES[$col] ? array_merge($CONTACT_COLTYPES[$col], (array)$colprop) : (array)$colprop;
	}

	// build form fields list
	foreach ($coltypes as $col => $colprop) {
	if ($colprop['type'] != 'image' && !$colprop['nosearch']) {
	$ftype = $colprop['type'] == 'select' ? 'select' : 'text';
	$label = isset($colprop['label']) ? $colprop['label'] : $RCMAIL->gettext($col);
	$category = $colprop['category'] ?: 'other';

	// load jquery UI datepicker for date fields
	if ($colprop['type'] == 'date') {
	$colprop['class'] .= ($colprop['class'] ? ' ' : '') . 'datepicker';
	}
	else if ($ftype == 'text') {
	$colprop['size'] = $i_size;
	}

	$colprop['id'] = '_search_' . $col;

	$content = html::div('row',
	html::label(array('class' => 'contactfieldlabel label', 'for' => $colprop['id']), rcube::Q($label))
	. html::div('contactfieldcontent', rcube_output::get_edit_field('search_'.$col, '', $colprop, $ftype)));

	$form[$category]['content'][] = $content;
	}
	}

	$hiddenfields = new html_hiddenfield();
	$hiddenfields->add(array('name' => '_adv', 'value' => 1));

	$out = $RCMAIL->output->request_form(array(
	'name' => 'form',
	'method' => 'post',
	'task' => $RCMAIL->task,
	'action' => 'search',
	'noclose' => true,
	) + $attrib, $hiddenfields->show());

	$RCMAIL->output->add_gui_object('editform', $attrib['id']);

	unset($attrib['name']);
	unset($attrib['id']);

	foreach ($form as $f) {
	if (!empty($f['content'])) {
	$content = html::div('contactfieldgroup', join("\n", $f['content']));

	$out .= html::tag('fieldset', $attrib,
	html::tag('legend', null, rcube::Q($f['name']))
	. $content) . "\n";
	}
	}

	return $out . '</form>';
	}
	diff --git a/program/steps/mail/list_contacts.inc b/program/steps/mail/list_contacts.inc
	index 313f1a5d3..d1c9a362b 100644
	--- a/program/steps/mail/list_contacts.inc
	+++ b/program/steps/mail/list_contacts.inc
	@@ -1,125 +1,127 @@
	<?php

	/**
	+-----------------------------------------------------------------------+
	\| This file is part of the Roundcube Webmail client \|
	\| \|
	\| Copyright (C) The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Send contacts list to client (as remote response) \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	$afields = $RCMAIL->config->get('contactlist_fields');
	$addr_sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');
	$page_size = $RCMAIL->config->get('addressbook_pagesize', $RCMAIL->config->get('pagesize', 50));
	$list_page = max(1, intval($_GET['_page']));
	$jsresult = array();

	// Use search result
	-if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']])) {
	- $search = (array)$_SESSION['search'][$_REQUEST['_search']];
	- $sparam = $_SESSION['search_params']['id'] == $_REQUEST['_search'] ? $_SESSION['search_params']['data'] : array();
	+if (!empty($_REQUEST['_search']) && isset($_SESSION['contact_search'][$_REQUEST['_search']])
	+ && is_array($_SESSION['contact_search'][$_REQUEST['_search']])
	+) {
	+ $search = $_SESSION['contact_search'][$_REQUEST['_search']];
	+ $sparam = $_SESSION['contact_search_params']['id'] == $_REQUEST['_search'] ? $_SESSION['contact_search_params']['data'] : array();

	// get records from all sources
	foreach ($search as $s => $set) {
	$CONTACTS = $RCMAIL->get_address_book($s);

	// list matching groups of this source (on page one)
	if ($sparam[1] && $CONTACTS->groups && $list_page == 1) {
	$jsresult += rcmail_compose_contact_groups($CONTACTS, $s, $sparam[1], (int)$RCMAIL->config->get('addressbook_search_mode'));
	}

	// reset page
	$CONTACTS->set_page(1);
	$CONTACTS->set_pagesize(9999);
	$CONTACTS->set_search_set($set);

	// get records
	$result = $CONTACTS->list_records($afields);

	while ($row = $result->next()) {
	$row['sourceid'] = $s;
	$key = rcube_addressbook::compose_contact_key($row, $addr_sort_col);
	$records[$key] = $row;
	}
	unset($result);
	}

	// sort the records
	ksort($records, SORT_LOCALE_STRING);

	// create resultset object
	$count = count($records);
	$first = ($list_page-1) * $page_size;
	$result = new rcube_result_set($count, $first);

	// we need only records for current page
	if ($page_size < $count) {
	$records = array_slice($records, $first, $page_size);
	}

	$result->records = array_values($records);
	}
	// list contacts from selected source
	else {
	$source = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);
	$CONTACTS = $RCMAIL->get_address_book($source);

	if ($CONTACTS && $CONTACTS->ready) {
	// set list properties
	$CONTACTS->set_pagesize($page_size);
	$CONTACTS->set_page($list_page);

	if ($group_id = rcube_utils::get_input_value('_gid', rcube_utils::INPUT_GET)) {
	$CONTACTS->set_group($group_id);
	}
	// list groups of this source (on page one)
	else if ($CONTACTS->groups && $CONTACTS->list_page == 1) {
	$jsresult = rcmail_compose_contact_groups($CONTACTS, $source);
	}

	// get contacts for this user
	$result = $CONTACTS->list_records($afields);
	}
	}

	if (!empty($result) && !$result->count && $result->searchonly) {
	$OUTPUT->show_message('contactsearchonly', 'notice');
	}
	else if (!empty($result) && $result->count > 0) {
	// create javascript list
	while ($row = $result->next()) {
	$name = rcube_addressbook::compose_list_name($row);

	// add record for every email address of the contact
	$emails = $CONTACTS->get_col_values('email', $row, true);
	foreach ($emails as $i => $email) {
	$source = $row['sourceid'] ?: $source;
	$row_id = $source.'-'.$row['ID'].'-'.$i;
	$jsresult[$row_id] = format_email_recipient($email, $name);
	$classname = $row['_type'] == 'group' ? 'group' : 'person';
	$keyname = $row['_type'] == 'group' ? 'contactgroup' : 'contact';

	$OUTPUT->command('add_contact_row', $row_id, array(
	$keyname => html::a(array('title' => $email), rcube::Q($name ?: $email) .
	($name && count($emails) > 1 ? ' ' . html::span('email', rcube::Q($email)) : '')
	)), $classname);
	}
	}
	}

	// update env
	$OUTPUT->set_env('contactdata', $jsresult);
	$OUTPUT->set_env('pagecount', ceil($result->count / $page_size));
	$OUTPUT->command('set_page_buttons');

	// send response
	$OUTPUT->send();
	diff --git a/program/steps/mail/search_contacts.inc b/program/steps/mail/search_contacts.inc
	index 77bbf57ee..a3ff6a27f 100644
	--- a/program/steps/mail/search_contacts.inc
	+++ b/program/steps/mail/search_contacts.inc
	@@ -1,119 +1,119 @@
	<?php

	/**
	+-----------------------------------------------------------------------+
	\| This file is part of the Roundcube Webmail client \|
	\| \|
	\| Copyright (C) The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	\| PURPOSE: \|
	\| Search contacts from the address book widget \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	$search = rcube_utils::get_input_value('_q', rcube_utils::INPUT_GPC, true);
	$sources = $RCMAIL->get_address_sources();
	$search_mode = (int) $RCMAIL->config->get('addressbook_search_mode');
	$addr_sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');
	$afields = $RCMAIL->config->get('contactlist_fields');
	$page_size = $RCMAIL->config->get('addressbook_pagesize', $RCMAIL->config->get('pagesize', 50));
	$records = array();
	$search_set = array();
	$jsresult = array();
	$search_mode \|= rcube_addressbook::SEARCH_GROUPS;

	foreach ($sources as $s) {
	$source = $RCMAIL->get_address_book($s['id']);
	$source->set_page(1);
	$source->set_pagesize(9999);

	// list matching groups of this source
	if ($source->groups) {
	$jsresult += rcmail_compose_contact_groups($source, $s['id'], $search, $search_mode);
	}

	// get contacts count
	$result = $source->search($afields, $search, $search_mode, true, true, 'email');

	if (!$result->count) {
	continue;
	}

	while ($row = $result->next()) {
	$row['sourceid'] = $s['id'];
	$key = rcube_addressbook::compose_contact_key($row, $addr_sort_col);
	$records[$key] = $row;
	}

	$search_set[$s['id']] = $source->get_search_set();
	unset($result);
	}

	$group_count = count($jsresult);

	// sort the records
	ksort($records, SORT_LOCALE_STRING);

	// create resultset object
	$count = count($records);
	$result = new rcube_result_set($count);

	// select the requested page
	if ($page_size < $count) {
	$records = array_slice($records, $result->first, $page_size);
	}

	$result->records = array_values($records);

	if (!empty($result) && $result->count > 0) {
	// create javascript list
	while ($row = $result->next()) {
	$name = rcube_addressbook::compose_list_name($row);
	$classname = $row['_type'] == 'group' ? 'group' : 'person';
	$keyname = $row['_type'] == 'group' ? 'contactgroup' : 'contact';

	// add record for every email address of the contact
	// (same as in list_contacts.inc)
	$emails = $source->get_col_values('email', $row, true);
	foreach ($emails as $i => $email) {
	$row_id = $row['sourceid'].'-'.$row['ID'].'-'.$i;
	$jsresult[$row_id] = format_email_recipient($email, $name);
	$title = rcube_addressbook::compose_search_name($row, $email, $name);

	$OUTPUT->command('add_contact_row', $row_id, array(
	$keyname => html::a(array('title' => $title), rcube::Q($name ?: $email) .
	($name && count($emails) > 1 ? ' ' . html::span('email', rcube::Q($email)) : '')
	)), $classname);
	}
	}

	// search request ID
	$search_request = md5('composeaddr' . $search);

	// save search settings in session
	- $_SESSION['search'][$search_request] = $search_set;
	- $_SESSION['search_params'] = array('id' => $search_request, 'data' => array($afields, $search));
	+ $_SESSION['contact_search'][$search_request] = $search_set;
	+ $_SESSION['contact_search_params'] = array('id' => $search_request, 'data' => array($afields, $search));

	$OUTPUT->show_message('contactsearchsuccessful', 'confirmation', array('nr' => $result->count));

	$OUTPUT->set_env('search_request', $search_request);
	$OUTPUT->set_env('source', '');
	$OUTPUT->command('unselect_directory');
	}
	else if (!$group_count) {
	$OUTPUT->show_message('nocontactsfound', 'notice');
	}

	// update env
	$OUTPUT->set_env('contactdata', $jsresult);
	$OUTPUT->set_env('pagecount', ceil($result->count / $page_size));
	$OUTPUT->command('set_page_buttons');

	// send response
	$OUTPUT->send();

File Metadata

Mime Type: text/x-diff
Expires: Fri, Apr 24, 1:01 PM (1 w, 2 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 18853010
Default Alt Text: (74 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions