No OneTemporary
Actions

Size

80 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/program/lib/Roundcube/rcube_addressbook.php b/program/lib/Roundcube/rcube_addressbook.php
	index 421062772..cbc3c6773 100644
	--- a/program/lib/Roundcube/rcube_addressbook.php
	+++ b/program/lib/Roundcube/rcube_addressbook.php
	@@ -1,572 +1,588 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2006-2012, 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: \|
	\| Interface to the local address book database \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/


	/**
	* Abstract skeleton of an address book/repository
	*
	* @package Framework
	* @subpackage Addressbook
	*/
	abstract class rcube_addressbook
	{
	/ constants for error reporting /
	const ERROR_READ_ONLY = 1;
	const ERROR_NO_CONNECTION = 2;
	const ERROR_VALIDATE = 3;
	const ERROR_SAVING = 4;
	const ERROR_SEARCH = 5;

	/** public properties (mandatory) */
	public $primary_key;
	public $groups = false;
	public $readonly = true;
	public $searchonly = false;
	public $undelete = false;
	public $ready = false;
	public $group_id = null;
	public $list_page = 1;
	public $page_size = 10;
	public $sort_col = 'name';
	public $sort_order = 'ASC';
	public $coltypes = array('name' => array('limit'=>1), 'firstname' => array('limit'=>1), 'surname' => array('limit'=>1), 'email' => array('limit'=>1));
	public $date_cols = array();

	protected $error;

	/**
	* Returns addressbook name (e.g. for addressbooks listing)
	*/
	abstract function get_name();

	/**
	* Save a search string for future listings
	*
	* @param mixed Search params to use in listing method, obtained by get_search_set()
	*/
	abstract function set_search_set($filter);

	/**
	* Getter for saved search properties
	*
	* @return mixed Search properties used by this class
	*/
	abstract function get_search_set();

	/**
	* Reset saved results and search parameters
	*/
	abstract function reset();

	/**
	* Refresh saved search set after data has changed
	*
	* @return mixed New search set
	*/
	function refresh_search()
	{
	return $this->get_search_set();
	}

	/**
	* List the current set of contact records
	*
	* @param array List of cols to show
	* @param int Only return this number of records, use negative values for tail
	* @return array Indexed list of contact records, each a hash array
	*/
	abstract function list_records($cols=null, $subset=0);

	/**
	* Search records
	*
	* @param array List of fields to search in
	* @param string Search value
	* @param int Matching mode:
	* 0 - partial (abc),
	* 1 - strict (=),
	* 2 - prefix (abc*)
	* @param boolean True if results are requested, False if count only
	* @param boolean True to skip the count query (select only)
	* @param array List of fields that cannot be empty
	* @return object rcube_result_set List of contact records and 'count' value
	*/
	abstract function search($fields, $value, $mode=0, $select=true, $nocount=false, $required=array());

	/**
	* Count number of available contacts in database
	*
	* @return rcube_result_set Result set with values for 'count' and 'first'
	*/
	abstract function count();

	/**
	* Return the last result set
	*
	* @return rcube_result_set Current result set or NULL if nothing selected yet
	*/
	abstract function get_result();

	/**
	* Get a specific contact record
	*
	* @param mixed record identifier(s)
	* @param boolean True to return record as associative array, otherwise a result set is returned
	*
	* @return mixed Result object with all record fields or False if not found
	*/
	abstract function get_record($id, $assoc=false);

	/**
	* Returns the last error occured (e.g. when updating/inserting failed)
	*
	* @return array Hash array with the following fields: type, message
	*/
	function get_error()
	{
	return $this->error;
	}

	/**
	* Setter for errors for internal use
	*
	* @param int Error type (one of this class' error constants)
	* @param string Error message (name of a text label)
	*/
	protected function set_error($type, $message)
	{
	$this->error = array('type' => $type, 'message' => $message);
	}

	/**
	* Close connection to source
	* Called on script shutdown
	*/
	function close() { }

	/**
	* Set internal list page
	*
	* @param number Page number to list
	* @access public
	*/
	function set_page($page)
	{
	$this->list_page = (int)$page;
	}

	/**
	* Set internal page size
	*
	* @param number Number of messages to display on one page
	* @access public
	*/
	function set_pagesize($size)
	{
	$this->page_size = (int)$size;
	}

	/**
	* Set internal sort settings
	*
	* @param string $sort_col Sort column
	* @param string $sort_order Sort order
	*/
	function set_sort_order($sort_col, $sort_order = null)
	{
	if ($sort_col != null && ($this->coltypes[$sort_col] \|\| in_array($sort_col, $this->coltypes))) {
	$this->sort_col = $sort_col;
	}
	if ($sort_order != null) {
	$this->sort_order = strtoupper($sort_order) == 'DESC' ? 'DESC' : 'ASC';
	}
	}

	/**
	* Check the given data before saving.
	* If input isn't valid, the message to display can be fetched using get_error()
	*
	* @param array Assoziative array with data to save
	* @param boolean Attempt to fix/complete record automatically
	* @return boolean True if input is valid, False if not.
	*/
	public function validate(&$save_data, $autofix = false)
	{
	$rcube = rcube::get_instance();

	// check validity of email addresses
	foreach ($this->get_col_values('email', $save_data, true) as $email) {
	if (strlen($email)) {
	if (!rcube_utils::check_email(rcube_utils::idn_to_ascii($email))) {
	$error = $rcube->gettext(array('name' => 'emailformaterror', 'vars' => array('email' => $email)));
	$this->set_error(self::ERROR_VALIDATE, $error);
	return false;
	}
	}
	}

	return true;
	}

	/**
	* Create a new contact record
	*
	* @param array Assoziative array with save data
	* Keys: Field name with optional section in the form FIELD:SECTION
	* Values: Field value. Can be either a string or an array of strings for multiple values
	* @param boolean True to check for duplicates first
	* @return mixed The created record ID on success, False on error
	*/
	function insert($save_data, $check=false)
	{
	/* empty for read-only address books */
	}

	/**
	* Create new contact records for every item in the record set
	*
	* @param object rcube_result_set Recordset to insert
	* @param boolean True to check for duplicates first
	* @return array List of created record IDs
	*/
	function insertMultiple($recset, $check=false)
	{
	$ids = array();
	if (is_object($recset) && is_a($recset, rcube_result_set)) {
	while ($row = $recset->next()) {
	if ($insert = $this->insert($row, $check))
	$ids[] = $insert;
	}
	}
	return $ids;
	}

	/**
	* Update a specific contact record
	*
	* @param mixed Record identifier
	* @param array Assoziative array with save data
	* Keys: Field name with optional section in the form FIELD:SECTION
	* Values: Field value. Can be either a string or an array of strings for multiple values
	* @return boolean True on success, False on error
	*/
	function update($id, $save_cols)
	{
	/* empty for read-only address books */
	}

	/**
	* Mark one or more contact records as deleted
	*
	* @param array Record identifiers
	* @param bool Remove records irreversible (see self::undelete)
	*/
	function delete($ids, $force=true)
	{
	/* empty for read-only address books */
	}

	/**
	* Unmark delete flag on contact record(s)
	*
	* @param array Record identifiers
	*/
	function undelete($ids)
	{
	/* empty for read-only address books */
	}

	/**
	* Mark all records in database as deleted
	*/
	function delete_all()
	{
	/* empty for read-only address books */
	}

	/**
	* Setter for the current group
	* (empty, has to be re-implemented by extending class)
	*/
	function set_group($gid) { }

	/**
	* List all active contact groups of this source
	*
	* @param string Optional search string to match group name
	* @return array Indexed list of contact groups, each a hash array
	*/
	function list_groups($search = null)
	{
	/* empty for address books don't supporting groups */
	return array();
	}

	/**
	* Get group properties such as name and email address(es)
	*
	* @param string Group identifier
	* @return array Group properties as hash array
	*/
	function get_group($group_id)
	{
	/* empty for address books don't supporting groups */
	return null;
	}

	/**
	* Create a contact group with the given name
	*
	* @param string The group name
	* @return mixed False on error, array with record props in success
	*/
	function create_group($name)
	{
	/* empty for address books don't supporting groups */
	return false;
	}

	/**
	* Delete the given group and all linked group members
	*
	* @param string Group identifier
	* @return boolean True on success, false if no data was changed
	*/
	function delete_group($gid)
	{
	/* empty for address books don't supporting groups */
	return false;
	}

	/**
	* Rename a specific contact group
	*
	* @param string Group identifier
	* @param string New name to set for this group
	* @param string New group identifier (if changed, otherwise don't set)
	* @return boolean New name on success, false if no data was changed
	*/
	function rename_group($gid, $newname, &$newid)
	{
	/* empty for address books don't supporting groups */
	return false;
	}

	/**
	* Add the given contact records the a certain group
	*
	* @param string Group identifier
	* @param array List of contact identifiers to be added
	* @return int Number of contacts added
	*/
	function add_to_group($group_id, $ids)
	{
	/* empty for address books don't supporting groups */
	return 0;
	}

	/**
	* Remove the given contact records from a certain group
	*
	* @param string Group identifier
	* @param array List of contact identifiers to be removed
	* @return int Number of deleted group members
	*/
	function remove_from_group($group_id, $ids)
	{
	/* empty for address books don't supporting groups */
	return 0;
	}

	/**
	* Get group assignments of a specific contact record
	*
	* @param mixed Record identifier
	*
	* @return array List of assigned groups as ID=>Name pairs
	* @since 0.5-beta
	*/
	function get_record_groups($id)
	{
	/* empty for address books don't supporting groups */
	return array();
	}

	/**
	* Utility function to return all values of a certain data column
	* either as flat list or grouped by subtype
	*
	* @param string Col name
	* @param array Record data array as used for saving
	* @param boolean True to return one array with all values, False for hash array with values grouped by type
	* @return array List of column values
	*/
	function get_col_values($col, $data, $flat = false)
	{
	$out = array();
	foreach ((array)$data as $c => $values) {
	if ($c === $col \|\| strpos($c, $col.':') === 0) {
	if ($flat) {
	$out = array_merge($out, (array)$values);
	}
	else {
	list($f, $type) = explode(':', $c);
	$out[$type] = array_merge((array)$out[$type], (array)$values);
	}
	}
	}

	// remove duplicates
	if ($flat && !empty($out)) {
	$out = array_unique($out);
	}

	return $out;
	}

	/**
	* Normalize the given string for fulltext search.
	* Currently only optimized for Latin-1 characters; to be extended
	*
	* @param string Input string (UTF-8)
	* @return string Normalized string
	* @deprecated since 0.9-beta
	*/
	protected static function normalize_string($str)
	{
	return rcube_utils::normalize_string($str);
	}

	/**
	* Compose a valid display name from the given structured contact data
	*
	* @param array Hash array with contact data as key-value pairs
	* @param bool Don't attempt to extract components from the email address
	*
	* @return string Display name
	*/
	public static function compose_display_name($contact, $full_email = false)
	{
	$contact = rcube::get_instance()->plugins->exec_hook('contact_displayname', $contact);
	$fn = $contact['name'];

	if (!$fn) // default display name composition according to vcard standard
	$fn = trim(join(' ', array_filter(array($contact['prefix'], $contact['firstname'], $contact['middlename'], $contact['surname'], $contact['suffix']))));

	// use email address part for name
	$email = is_array($contact['email']) ? $contact['email'][0] : $contact['email'];

	if ($email && (empty($fn) \|\| $fn == $email)) {
	// return full email
	if ($full_email)
	return $email;

	list($emailname) = explode('@', $email);
	if (preg_match('/(.)[\.\-\_](.)/', $emailname, $match))
	$fn = trim(ucfirst($match[1]).' '.ucfirst($match[2]));
	else
	$fn = ucfirst($emailname);
	}

	return $fn;
	}

	/**
	* Compose the name to display in the contacts list for the given contact record.
	* This respects the settings parameter how to list conacts.
	*
	* @param array Hash array with contact data as key-value pairs
	* @return string List name
	*/
	public static function compose_list_name($contact)
	{
	static $compose_mode;

	if (!isset($compose_mode)) // cache this
	$compose_mode = rcube::get_instance()->config->get('addressbook_name_listing', 0);

	if ($compose_mode == 3)
	$fn = join(' ', array($contact['surname'] . ',', $contact['firstname'], $contact['middlename']));
	else if ($compose_mode == 2)
	$fn = join(' ', array($contact['surname'], $contact['firstname'], $contact['middlename']));
	else if ($compose_mode == 1)
	$fn = join(' ', array($contact['firstname'], $contact['middlename'], $contact['surname']));
	else
	$fn = !empty($contact['name']) ? $contact['name'] : join(' ', array($contact['prefix'], $contact['firstname'], $contact['middlename'], $contact['surname'], $contact['suffix']));

	$fn = trim($fn, ', ');

	// fallback to display name
	if (empty($fn) && $contact['name'])
	$fn = $contact['name'];

	// fallback to email address
	$email = is_array($contact['email']) ? $contact['email'][0] : $contact['email'];
	if (empty($fn) && $email)
	return $email;

	return $fn;
	}

	+ /**
	+ * Create a unique key for sorting contacts
	+ */
	+ public static function compose_contact_key($contact, $sort_col)
	+ {
	+ $key = $contact[$sort_col] . ':' . $row['sourceid'];
	+
	+ // add email to a key to not skip contacts with the same name (#1488375)
	+ if (!empty($contact['email'])) {
	+ $key .= ':' . implode(':', (array)$contact['email']);
	+ }
	+
	+ return $key;
	+ }
	+
	+
	/**
	* Compare search value with contact data
	*
	* @param string $colname Data name
	* @param string\|array $value Data value
	* @param string $search Search value
	* @param int $mode Search mode
	*
	* @return bool Comparision result
	*/
	protected function compare_search_value($colname, $value, $search, $mode)
	{
	// The value is a date string, for date we'll
	// use only strict comparison (mode = 1)
	// @TODO: partial search, e.g. match only day and month
	if (in_array($colname, $this->date_cols)) {
	return (($value = rcube_utils::strtotime($value))
	&& ($search = rcube_utils::strtotime($search))
	&& date('Ymd', $value) == date('Ymd', $search));
	}

	// composite field, e.g. address
	foreach ((array)$value as $val) {
	$val = mb_strtolower($val);
	switch ($mode) {
	case 1:
	$got = ($val == $search);
	break;

	case 2:
	$got = ($search == substr($val, 0, strlen($search)));
	break;

	default:
	$got = (strpos($val, $search) !== false);
	}

	if ($got) {
	return true;
	}
	}

	return false;
	}

	}

	diff --git a/program/steps/addressbook/delete.inc b/program/steps/addressbook/delete.inc
	index 81b8a0970..56118583c 100644
	--- a/program/steps/addressbook/delete.inc
	+++ b/program/steps/addressbook/delete.inc
	@@ -1,165 +1,165 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/addressbook/delete.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2009, 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: \|
	\| Delete the submitted contacts (CIDs) from the users address book \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	// process ajax requests only
	if (!$OUTPUT->ajax_call)
	return;

	$cids = rcmail_get_cids();
	$delcnt = 0;

	// remove previous deletes
	$undo_time = $RCMAIL->config->get('undo_timeout', 0);
	$RCMAIL->session->remove('contact_undo');

	foreach ($cids as $source => $cid)
	{
	$CONTACTS = rcmail_contact_source($source);

	if ($CONTACTS->readonly) {
	// more sources? do nothing, probably we have search results from
	// more than one source, some of these sources can be readonly
	if (count($cids) == 1) {
	$OUTPUT->show_message('contactdelerror', 'error');
	$OUTPUT->command('list_contacts');
	$OUTPUT->send();
	}
	continue;
	}

	$plugin = $RCMAIL->plugins->exec_hook('contact_delete', array(
	'id' => $cid, 'source' => $source));

	$deleted = !$plugin['abort'] ? $CONTACTS->delete($cid, $undo_time < 1) : $plugin['result'];

	if (!$deleted) {
	$OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'contactdelerror', 'error');
	$OUTPUT->command('list_contacts');
	$OUTPUT->send();
	}
	else {
	$delcnt += $deleted;

	// store deleted contacts IDs in session for undo action
	if ($undo_time > 0 && $CONTACTS->undelete) {
	$_SESSION['contact_undo']['data'][$source] = $cid;
	}
	}
	}

	$page = isset($_SESSION['page']) ? $_SESSION['page'] : 1;

	// update saved search after data changed
	if (($search_request = $_REQUEST['_search']) && isset($_SESSION['search'][$search_request])) {
	$sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');
	$afields = $RCMAIL->config->get('contactlist_fields');
	$search = (array)$_SESSION['search'][$search_request];
	$records = array();

	// Get records from all sources (refresh search)
	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;
	}

	while ($row = $result->next()) {
	$row['sourceid'] = $s;
	- $key = rcmail_contact_key($row, $sort_col);
	+ $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;

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

	// get records from the next page to add to the list
	$pages = ceil((count($records) + $delcnt) / $PAGE_SIZE);
	if ($_GET['_from'] != 'show' && $pages > 1 && $page < $pages) {
	// sort the records
	ksort($records, SORT_LOCALE_STRING);

	$first += $PAGE_SIZE;
	// create resultset object
	$res = new rcube_result_set($count, $first - $delcnt);

	if ($PAGE_SIZE < $count) {
	$records = array_slice($records, $first - $delcnt, $delcnt);
	}

	$res->records = array_values($records);
	$records = $res;
	}
	else {
	unset($records);
	}
	}
	else {
	// count contacts for this user
	$result = $CONTACTS->count();

	// get records from the next page to add to the list
	$pages = ceil(($result->count + $delcnt) / $PAGE_SIZE);
	if ($_GET['_from'] != 'show' && $pages > 1 && $page < $pages) {
	$CONTACTS->set_page($page);
	$records = $CONTACTS->list_records(null, -$delcnt);
	}
	}

	// update message count display
	$OUTPUT->set_env('pagecount', ceil($result->count / $PAGE_SIZE));
	$OUTPUT->command('set_rowcount', rcmail_get_rowcount_text($result));

	if (!empty($_SESSION['contact_undo'])) {
	$_SESSION['contact_undo']['ts'] = time();
	$msg = html::span(null, rcube_label('contactdeleted'))
	. ' ' . html::a(array('onclick' => JS_OBJECT_NAME.".command('undo', '', this)"), rcube_label('undo'));

	$OUTPUT->show_message($msg, 'confirmation', null, true, $undo_time);
	}
	else {
	$OUTPUT->show_message('contactdeleted', 'confirmation');
	}

	// add new rows from next page (if any)
	if (!empty($records)) {
	rcmail_js_contacts_list($records);
	}

	// send response
	$OUTPUT->send();
	diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc
	index fc9f23fa1..15bf8b0d4 100644
	--- a/program/steps/addressbook/export.inc
	+++ b/program/steps/addressbook/export.inc
	@@ -1,163 +1,163 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/addressbook/export.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2008-2011, The Roundcube Dev Team \|
	\| Copyright (C) 2011, 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> \|
	+-----------------------------------------------------------------------+
	*/

	// Use search result
	if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']]))
	{
	$sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');
	$search = (array)$_SESSION['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
	if (empty($record['vcard']) \|\| empty($record['name'])) {
	$vcard = new rcube_vcard();
	$vcard->extend_fieldmap($source->vcard_map);
	$vcard->load($record['vcard']);
	$vcard->reset();

	foreach ($record as $key => $values) {
	list($field, $section) = explode(':', $key);
	foreach ((array)$values as $value) {
	if (is_array($value) \|\| @strlen($value)) {
	$vcard->set($field, $value, strtoupper($section));
	}
	}
	}

	$record['vcard'] = $vcard->export(true);
	}

	$record['sourceid'] = $s;
	- $key = rcmail_contact_key($record, $sort_col);
	+ $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);
	$result = $source->search('ID', $ids, 1, true, true);

	while ($record = $result->next()) {
	// because vcard_map is per-source we need to create vcard here
	if (empty($record['vcard']) \|\| empty($record['name'])) {
	$vcard = new rcube_vcard();
	$vcard->extend_fieldmap($source->vcard_map);
	$vcard->load($record['vcard']);
	$vcard->reset();

	foreach ($record as $key => $values) {
	list($field, $section) = explode(':', $key);
	foreach ((array)$values as $value) {
	if (is_array($value) \|\| @strlen($value)) {
	$vcard->set($field, $value, strtoupper($section));
	}
	}
	}

	$record['vcard'] = $vcard->export(true);
	}

	$record['sourceid'] = $s;
	- $key = rcmail_contact_key($record, $sort_col);
	+ $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);
	}

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

	while ($result && ($row = $result->next())) {
	// we already have a vcard record
	if ($row['vcard'] && $row['name']) {
	$row['vcard'] = preg_replace('/\r?\n/', rcube_vcard::$eol, $row['vcard']);
	echo rcube_vcard::rfc2425_fold($row['vcard']) . rcube_vcard::$eol;
	}
	// copy values into vcard object
	else {
	$vcard = new rcube_vcard();
	$vcard->extend_fieldmap($CONTACTS->vcard_map);
	$vcard->load($row['vcard']);
	$vcard->reset();

	foreach ($row as $key => $values) {
	list($field, $section) = explode(':', $key);
	foreach ((array)$values as $value) {
	if (is_array($value) \|\| @strlen($value))
	$vcard->set($field, $value, strtoupper($section));
	}
	}

	echo $vcard->export(true) . rcube_vcard::$eol;
	}
	}

	exit;
	diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
	index 2f47483de..7fb862d5e 100644
	--- a/program/steps/addressbook/func.inc
	+++ b/program/steps/addressbook/func.inc
	@@ -1,819 +1,801 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/addressbook/func.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2012, 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' => rcube_label('name'), 'category' => 'main'),
	'firstname' => array('type' => 'text', 'size' => 19, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('firstname'), 'category' => 'main'),
	'surname' => array('type' => 'text', 'size' => 19, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('surname'), 'category' => 'main'),
	'email' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => rcube_label('email'), 'subtypes' => array('home','work','other'), 'category' => 'main'),
	'middlename' => array('type' => 'text', 'size' => 19, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('middlename'), 'category' => 'main'),
	'prefix' => array('type' => 'text', 'size' => 8, 'maxlength' => 20, 'limit' => 1, 'label' => rcube_label('nameprefix'), 'category' => 'main'),
	'suffix' => array('type' => 'text', 'size' => 8, 'maxlength' => 20, 'limit' => 1, 'label' => rcube_label('namesuffix'), 'category' => 'main'),
	'nickname' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('nickname'), 'category' => 'main'),
	'jobtitle' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('jobtitle'), 'category' => 'main'),
	'organization' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('organization'), 'category' => 'main'),
	'department' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('department'), 'category' => 'main'),
	'gender' => array('type' => 'select', 'limit' => 1, 'label' => rcube_label('gender'), 'options' => array('male' => rcube_label('male'), 'female' => rcube_label('female')), 'category' => 'personal'),
	'maidenname' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('maidenname'), 'category' => 'personal'),
	'phone' => array('type' => 'text', 'size' => 40, 'maxlength' => 20, 'label' => rcube_label('phone'), 'subtypes' => array('home','home2','work','work2','mobile','main','homefax','workfax','car','pager','video','assistant','other'), 'category' => 'main'),
	'address' => array('type' => 'composite', 'label' => rcube_label('address'), 'subtypes' => array('home','work','other'), 'childs' => array(
	'street' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => rcube_label('street'), 'category' => 'main'),
	'locality' => array('type' => 'text', 'size' => 28, 'maxlength' => 50, 'label' => rcube_label('locality'), 'category' => 'main'),
	'zipcode' => array('type' => 'text', 'size' => 8, 'maxlength' => 15, 'label' => rcube_label('zipcode'), 'category' => 'main'),
	'region' => array('type' => 'text', 'size' => 12, 'maxlength' => 50, 'label' => rcube_label('region'), 'category' => 'main'),
	'country' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => rcube_label('country'), 'category' => 'main'),
	), 'category' => 'main'),
	'birthday' => array('type' => 'date', 'size' => 12, 'maxlength' => 16, 'label' => rcube_label('birthday'), 'limit' => 1, 'render_func' => 'rcmail_format_date_col', 'category' => 'personal'),
	'anniversary' => array('type' => 'date', 'size' => 12, 'maxlength' => 16, 'label' => rcube_label('anniversary'), 'limit' => 1, 'render_func' => 'rcmail_format_date_col', 'category' => 'personal'),
	'website' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => rcube_label('website'), 'subtypes' => array('homepage','work','blog','profile','other'), 'category' => 'main'),
	'im' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => rcube_label('instantmessenger'), 'subtypes' => array('aim','icq','msn','yahoo','jabber','skype','other'), 'category' => 'main'),
	'notes' => array('type' => 'textarea', 'size' => 40, 'rows' => 15, 'maxlength' => 500, 'label' => rcube_label('notes'), 'limit' => 1),
	'photo' => array('type' => 'image', 'limit' => 1, 'category' => 'main'),
	'assistant' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('assistant'), 'category' => 'personal'),
	'manager' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('manager'), 'category' => 'personal'),
	'spouse' => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('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]);
	}
	}

	$search_mods = $RCMAIL->config->get('addressbook_search_mods', $SEARCH_MODS_DEFAULT);
	$OUTPUT->set_env('search_mods', $search_mods);
	$OUTPUT->set_env('address_sources', $js_list);
	$OUTPUT->set_env('writable_source', $writeable);
	$OUTPUT->set_env('compose_extwin', $RCMAIL->config->get('compose_extwin',false));

	$OUTPUT->set_pagetitle(rcube_label('addressbook'));
	$_SESSION['addressbooks_count'] = $count;
	$_SESSION['addressbooks_count_writeable'] = $writeable;

	// select address book
	$source = get_input_value('_source', RCUBE_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');
	}

	// 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 = get_input_value('_source', RCUBE_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 (!empty($_REQUEST['_gid']))
	$CONTACTS->set_group(get_input_value('_gid', RCUBE_INPUT_GPC));

	if (!$init_env)
	return $CONTACTS;

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

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

	// get address book name (for display)
	if ($abook && $_SESSION['addressbooks_count'] > 1) {
	$name = $abook->get_name();
	if (!$name && $source == 0) {
	$name = rcube_label('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 = '';
	$local_id = '0';
	$jsdata = array();

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

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

	// currently selected source
	$current = get_input_value('_source', RCUBE_INPUT_GPC);

	foreach ($sources as $j => $source) {
	$id = strval(strlen($source['id']) ? $source['id'] : $j);
	$js_id = 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 = !empty($source['name']) ? $source['name'] : $id;
	$out .= sprintf($line_templ,
	html_identifier($id),
	$class_name,
	Q(rcmail_url(null, 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'];
	}

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

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

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

	$out .= sprintf($line_templ,
	html_identifier($id),
	$class_name,
	$id,
	$js_id, (!empty($source['name']) ? Q($source['name']) : Q($id)));
	}

	$OUTPUT->set_env('contactgroups', $jsdata);
	$OUTPUT->add_gui_object('folderlist', $attrib['id']);
	// add some labels to client
	$OUTPUT->add_label('deletegroupconfirm', 'groupdeleting', 'addingmember', 'removingmember');

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


	function rcmail_contact_groups($args)
	{
	global $RCMAIL;

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

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

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

	return $args;
	}


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

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

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

	// create XHTML table
	$out = rcube_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', 'contactdeleting');

	return $out;
	}


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

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

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

	while ($row = $result->next()) {
	$a_row_cols = array();
	$classes = array('person'); // org records will follow some day

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

	// format each col
	foreach ($a_show_cols as $col) {
	$val = $col == 'name' ? rcube_addressbook::compose_list_name($row) : $row[$col];
	$a_row_cols[$col] = Q($val);
	}

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

	$OUTPUT->command($prefix.'add_contact_row', $row['ID'], $a_row_cols, join(' ', $classes));
	}
	}


	// similar function as /steps/settings/identities.inc::rcmail_identity_frame()
	function rcmail_contact_frame($attrib)
	{
	global $OUTPUT;

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

	return $OUTPUT->frame($attrib, true);
	}


	function rcmail_rowcount_display($attrib)
	{
	global $OUTPUT;

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

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

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

	return html::span($attrib, rcube_label('loading'));
	}


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

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

	if ($result->count == 0)
	$out = rcube_label('nocontactsfound');
	else
	$out = rcube_label(array(
	'name' => $_SESSION['contactcountdisplay'] ? $_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)
	{
	$label = 'type'.$type;
	if (rcube_label_exists($label, '*', $domain))
	return rcube_label($label, $domain);
	else if (preg_match('/\w+(\d+)$/', $label, $m)
	&& ($label = preg_replace('/(\d+)$/', '', $label))
	&& rcube_label_exists($label, '*', $domain))
	return rcube_label($label, $domain) . ' ' . $m[1];

	return ucfirst($type);
	}


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

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

	$form = $plugin['form'];
	$record = $plugin['record'];
	$edit_mode = $RCMAIL->action != 'show';
	$del_button = $attrib['deleteicon'] ? html::img(array('src' => $CONFIG['skin_path'] . $attrib['deleteicon'], 'alt' => rcube_label('delete'))) : rcube_label('delete');
	unset($attrib['deleteicon']);
	$out = '';

	// 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'));
	$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));
	$select_add->add(rcube_label('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']);

	// group fields
	$field_blocks = array(
	'names' => array('prefix','firstname','middlename','surname','suffix'),
	'displayname' => array('name'),
	'nickname' => array('nickname'),
	'organization' => array('organization'),
	'department' => array('department'),
	'jobtitle' => array('jobtitle'),
	);
	foreach ($field_blocks as $blockname => $colnames) {
	$fields = '';
	foreach ($colnames as $col) {
	// skip cols unknown to the backend
	if (!$coltypes[$col])
	continue;

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

	if ($RCMAIL->action == 'show') {
	if (!empty($record[$col]))
	$fields .= html::span('namefield ' . $col, Q($record[$col])) . " ";
	}
	else {
	$colprop = (array)$fieldset['content'][$col] + (array)$coltypes[$col];
	$colprop['id'] = 'ff_'.$col;
	if (empty($record[$col]) && !$colprop['visible']) {
	$colprop['style'] = 'display:none';
	$select_add->add($colprop['label'], $col);
	}
	$fields .= rcmail_get_edit_field($col, $record[$col], $colprop, $colprop['type']);
	}
	}
	$content .= html::div($blockname, $fields);
	}

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

	$out .= html::tag('fieldset', $attrib, (!empty($fieldset['name']) ? html::tag('legend', null, Q($fieldset['name'])) : '') . $content) ."\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])
	continue;

	// merge colprop with global coltype configuration
	$colprop += $coltypes[$field];
	$label = isset($colprop['label']) ? $colprop['label'] : rcube_label($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'));
	$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 ($colprop['subtypes'] as $i => $st) {
	$newval = false;
	if ($record[$field.':'.$st]) {
	$subtypes[count($values)] = $st;
	$newval = $record[$field.':'.$st];
	}
	else if ($i == 0 && $record[$field]) {
	$subtypes[count($values)] = $st;
	$newval = $record[$field];
	}
	if ($newval !== false) {
	if (is_array($newval) && isset($newval[0]))
	$values = array_merge($values, $newval);
	else
	$values[] = $newval;
	}
	}
	}
	else {
	$values = $record[$fullkey] ? $record[$fullkey] : $record[$field];
	$subtypes = null;
	}
	}

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

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

	// render composite field
	if ($colprop['type'] == 'composite') {
	$composite = array(); $j = 0;
	$template = $RCMAIL->config->get($col . '_template', '{'.join('} {', array_keys($colprop['childs'])).'}');
	foreach ($colprop['childs'] as $childcol => $cp) {
	if (!empty($val) && is_array($val)) {
	$childvalue = $val[$childcol] ? $val[$childcol] : $val[$j];
	}
	else {
	$childvalue = '';
	}

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

	$coltypes[$field] += (array)$colprop;
	$coltypes[$field]['count']++;
	$val = preg_replace('/\{\w+\}/', '', strtr($template, $composite));
	}
	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 = rcmail_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 = Q($val);

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

	// add delete button/link
	if ($edit_mode && !($colprop['visible'] && $colprop['limit'] == 1))
	$val .= html::a(array('href' => '#del', 'class' => 'contactfieldbutton deletebutton', 'title' => rcube_label('delete'), 'rel' => $col), $del_button);

	// display row with label
	if ($label) {
	$rows .= html::div('row',
	html::div('contactfieldlabel label', $select_subtype ? $select_subtype->show($subtype) : Q($label)) .
	html::div('contactfieldcontent '.$colprop['type'], $val));
	}
	else // row without label
	$rows .= html::div('row', 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) {
	$content .= html::tag('fieldset', array('class' => 'contactfieldgroup ' . ($colprop['subtypes'] ? 'contactfieldgroupmulti ' : '') . 'contactcontroller' . $col, 'style' => ($rows ? null : 'display:none')),
	($colprop['subtypes'] ? html::tag('legend', null, 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', null, html::tag('legend', null, 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, $CONFIG;

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

	$photo_img = $attrib['placeholder'] ? $CONFIG['skin_path'] . $attrib['placeholder'] : 'program/resources/blank.gif';
	$RCMAIL->output->set_env('photo_placeholder', $photo_img);
	unset($attrib['placeholder']);

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

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

	$img = html::img(array('src' => $photo_img, 'border' => 1, 'alt' => ''));
	$content = html::div($attrib, $img);

	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 format_date($val, $RCMAIL->config->get('date_format', 'Y-m-d'), false);
	}


	-function rcmail_contact_key($row, $sort_col)
	-{
	- $key = $row[$sort_col] . ':' . $row['sourceid'];
	-
	- // add email to a key to not skip contacts with the same name (#1488375)
	- if (!empty($row['email'])) {
	- if (is_array($row['email'])) {
	- $key .= ':' . implode(':', $row['email']);
	- }
	- else {
	- $key .= ':' . $row['email'];
	- }
	- }
	-
	- return $key;
	-}
	-
	-
	/**
	* 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)
	{
	// 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 = get_input_value('_cid', RCUBE_INPUT_GPC);
	$source = (string) get_input_value('_source', RCUBE_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);
	$result = array();

	// create per-source contact IDs array
	foreach ($cid as $id) {
	// get source from decoded ID
	if ($sep = strrpos($id, '-')) {
	$contact_id = substr($id, 0, $sep);
	$source_id = substr($id, $sep+1);
	if (strlen($source_id)) {
	$result[(string)$source_id][] = $contact_id;
	}
	}
	else {
	$result[$source][] = $id;
	}
	}

	return $filter !== null ? $result[$filter] : $result;
	}


	// register UI objects
	$OUTPUT->add_handlers(array(
	'directorylist' => 'rcmail_directory_list',
	// 'groupslist' => 'rcmail_contact_groups',
	'addresslist' => 'rcmail_contacts_list',
	'addressframe' => 'rcmail_contact_frame',
	'recordscountdisplay' => 'rcmail_rowcount_display',
	'searchform' => array($OUTPUT, 'search_form')
	));

	// register action aliases
	$RCMAIL->register_action_map(array(
	'add' => 'edit.inc',
	'photo' => 'show.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',
	));
	diff --git a/program/steps/addressbook/list.inc b/program/steps/addressbook/list.inc
	index 06a1e10a3..1bb28658b 100644
	--- a/program/steps/addressbook/list.inc
	+++ b/program/steps/addressbook/list.inc
	@@ -1,94 +1,94 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/addressbook/list.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2012, 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');

	// Use search result
	if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']]))
	{
	$search = (array)$_SESSION['search'][$_REQUEST['_search']];
	$records = array();

	if (!empty($_GET['_page']))
	$page = intval($_GET['_page']);
	else
	$page = isset($_SESSION['page']) ? $_SESSION['page'] : 1;

	$_SESSION['page'] = $page;
	$sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');

	// 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(9999);
	$source->set_search_set($set);

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

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

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

	// create resultset object
	$count = count($records);
	$first = ($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 selected directory
	else {
	$CONTACTS = rcmail_contact_source(null, true);

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

	if (!$result->count && $result->searchonly) {
	$OUTPUT->show_message('contactsearchonly', 'notice');
	$OUTPUT->command('command', 'advanced-search');
	}
	}

	// update message count display
	$OUTPUT->set_env('pagecount', ceil($result->count / $PAGE_SIZE));
	$OUTPUT->command('set_rowcount', rcmail_get_rowcount_text($result));

	// create javascript list
	rcmail_js_contacts_list($result);

	// send response
	$OUTPUT->send();
	diff --git a/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc
	index bbd9b9a76..d153c255a 100644
	--- a/program/steps/addressbook/search.inc
	+++ b/program/steps/addressbook/search.inc
	@@ -1,341 +1,341 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/addressbook/search.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2011, The Roundcube Dev Team \|
	\| Copyright (C) 2011, 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 = get_input_value('_search', RCUBE_INPUT_POST);
	$name = get_input_value('_name', RCUBE_INPUT_POST, true);

	if (($params = $_SESSION['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', Q($name), Q($result));
	}
	else
	$OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'savedsearchcreateerror', 'error');

	$OUTPUT->send();
	}

	if ($RCMAIL->action == 'search-delete') {
	$id = get_input_value('_sid', RCUBE_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', Q($id));
	// contact list will be cleared, clear also page counter
	$OUTPUT->command('set_rowcount', rcube_label('nocontactsfound'));
	$OUTPUT->set_env('pagecount', 0);
	}
	else
	$OUTPUT->show_message($plugin['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 = get_input_value('_sid', RCUBE_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(get_input_value($key, RCUBE_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(get_input_value('_q', RCUBE_INPUT_GET, true));
	$fields = explode(',', get_input_value('_headers', RCUBE_INPUT_GET));

	if (empty($fields)) {
	$fields = array_keys($SEARCH_MODS_DEFAULT);
	}
	else {
	$fields = array_filter($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');

	// 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 = rcmail_contact_key($row, $sort_col);
	+ $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['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->command('set_env', 'search_request', $search_request);
	$OUTPUT->command('set_env', 'pagecount', ceil($result->count / $PAGE_SIZE));
	$OUTPUT->command('set_rowcount', rcmail_get_rowcount_text($result));
	// Re-set current source
	$OUTPUT->command('set_env', 'search_id', $sid);
	$OUTPUT->command('set_env', 'source', '');
	$OUTPUT->command('set_env', 'group', '');

	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($adv ? 'iframe' : null);
	}

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

	$i_size = !empty($attrib['size']) ? $attrib['size'] : 30;

	$form = array(
	'main' => array(
	'name' => rcube_label('properties'),
	'content' => array(
	),
	),
	'personal' => array(
	'name' => rcube_label('personalinfo'),
	'content' => array(
	),
	),
	'other' => array(
	'name' => rcube_label('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'] : rcube_label($col);
	$category = $colprop['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;


	$content = html::div('row', html::div('contactfieldlabel label', Q($label))
	. html::div('contactfieldcontent', rcmail_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, Q($f['name']))
	. $content) . "\n";
	}
	}

	return $out . '</form>';
	}

File Metadata

Mime Type: text/x-diff
Expires: Sat, Mar 1, 7:05 AM (1 d, 7 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 166218
Default Alt Text: (80 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions