No OneTemporary
Actions

Size

58 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc
	index f9d74e4fb..69fcba93c 100644
	--- a/program/steps/addressbook/edit.inc
	+++ b/program/steps/addressbook/edit.inc
	@@ -1,273 +1,273 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/addressbook/edit.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2007, The Roundcube Dev Team \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Show edit form for a contact entry or to add a new one \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id$

	*/

	if ($RCMAIL->action == 'edit') {
	// Get contact ID and source ID from request
	$cids = rcmail_get_cids();
	$source = key($cids);
	$cid = array_shift($cids[$source]);

	// Initialize addressbook
	$CONTACTS = rcmail_contact_source($source, true);

	// Contact edit
	if ($cid && ($record = $CONTACTS->get_record($cid, true))) {
	$OUTPUT->set_env('cid', $record['ID']);
	}

	// adding not allowed here
	if ($CONTACTS->readonly) {
	$OUTPUT->show_message('sourceisreadonly');
	rcmail_overwrite_action('show');
	return;
	}
	}
	else {
	$source = get_input_value('_source', RCUBE_INPUT_GPC);

	$CONTACTS = $RCMAIL->get_address_book($source);

	// find writable addressbook
	if (!$CONTACTS \|\| $CONTACTS->readonly)
	$source = rcmail_default_source(true);

	// Initialize addressbook
	$CONTACTS = rcmail_contact_source($source, true);
	}

	$SOURCE_ID = $source;
	-
	+rcmail_set_sourcename($CONTACTS);

	function rcmail_get_edit_record()
	{
	global $RCMAIL, $CONTACTS;

	// check if we have a valid result
	if ($GLOBALS['EDIT_RECORD']) {
	$record = $GLOBALS['EDIT_RECORD'];
	}
	else if ($RCMAIL->action != 'add'
	&& !(($result = $CONTACTS->get_result()) && ($record = $result->first()))
	) {
	$RCMAIL->output->show_message('contactnotfound');
	return false;
	}

	return $record;
	}

	function rcmail_contact_edithead($attrib)
	{
	// check if we have a valid result
	$record = rcmail_get_edit_record();
	$i_size = !empty($attrib['size']) ? $attrib['size'] : 20;

	$form = array(
	'head' => array(
	'content' => array(
	'prefix' => array('size' => $i_size),
	'firstname' => array('size' => $i_size, 'visible' => true),
	'middlename' => array('size' => $i_size),
	'surname' => array('size' => $i_size, 'visible' => true),
	'suffix' => array('size' => $i_size),
	'name' => array('size' => 2*$i_size),
	'nickname' => array('size' => 2*$i_size),
	'company' => array('size' => $i_size),
	'department' => array('size' => $i_size),
	'jobtitle' => array('size' => $i_size),
	)
	)
	);

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form'], $attrib['name'], $attrib['size']);

	// return the address edit form
	$out = rcmail_contact_form($form, $record, $attrib);

	return $form_start . $out . $form_end;
	}

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

	$record = rcmail_get_edit_record();

	// add some labels to client
	$RCMAIL->output->add_label('noemailwarning', 'nonamewarning');

	// copy (parsed) address template to client
	if (preg_match_all('/\{([a-z0-9]+)\}([^{]*)/i', $RCMAIL->config->get('address_template', ''), $templ, PREG_SET_ORDER))
	$RCMAIL->output->set_env('address_template', $templ);

	$i_size = !empty($attrib['size']) ? $attrib['size'] : 40;
	$t_rows = !empty($attrib['textarearows']) ? $attrib['textarearows'] : 10;
	$t_cols = !empty($attrib['textareacols']) ? $attrib['textareacols'] : 40;

	$form = array(
	'contact' => array(
	'name' => rcube_label('contactproperties'),
	'content' => array(
	'email' => array('size' => $i_size, 'visible' => true),
	'phone' => array('size' => $i_size, 'visible' => true),
	'address' => array('visible' => true),
	'website' => array('size' => $i_size),
	'im' => array('size' => $i_size),
	),
	),
	'personal' => array(
	'name' => rcube_label('personalinfo'),
	'content' => array(
	'gender' => array('visible' => true),
	'maidenname' => array('size' => $i_size),
	'birthday' => array('visible' => true),
	'anniversary' => array(),
	'manager' => array('size' => $i_size),
	'assistant' => array('size' => $i_size),
	'spouse' => array('size' => $i_size),
	),
	),
	);

	if (isset($CONTACT_COLTYPES['notes'])) {
	$form['notes'] = array(
	'name' => rcube_label('notes'),
	'content' => array(
	'notes' => array('size' => $t_cols, 'rows' => $t_rows, 'label' => false, 'visible' => true, 'limit' => 1),
	),
	'single' => true,
	);
	}

	list($form_start, $form_end) = get_form_tags($attrib);
	unset($attrib['form']);

	// return the complete address edit form as table
	$out = rcmail_contact_form($form, $record, $attrib);

	return $form_start . $out . $form_end;
	}

	function rcmail_upload_photo_form($attrib)
	{
	global $OUTPUT;

	// add ID if not given
	if (!$attrib['id'])
	$attrib['id'] = 'rcmUploadbox';

	// find max filesize value
	$max_filesize = parse_bytes(ini_get('upload_max_filesize'));
	$max_postsize = parse_bytes(ini_get('post_max_size'));
	if ($max_postsize && $max_postsize < $max_filesize)
	$max_filesize = $max_postsize;
	$max_filesize = show_bytes($max_filesize);

	$hidden = new html_hiddenfield(array('name' => '_cid', 'value' => $GLOBALS['cid']));
	$input = new html_inputfield(array('type' => 'file', 'name' => '_photo', 'size' => $attrib['size']));
	$button = new html_inputfield(array('type' => 'button'));

	$out = html::div($attrib,
	$OUTPUT->form_tag(array('name' => 'uploadform', 'method' => 'post', 'enctype' => 'multipart/form-data'),
	$hidden->show() .
	html::div(null, $input->show()) .
	html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))) .
	html::div('buttons',
	$button->show(rcube_label('close'), array('class' => 'button', 'onclick' => "$('#$attrib[id]').hide()")) . ' ' .
	$button->show(rcube_label('upload'), array('class' => 'button mainaction', 'onclick' => JS_OBJECT_NAME . ".command('upload-photo', this.form)"))
	)
	)
	);

	$OUTPUT->add_label('addphoto','replacephoto');
	$OUTPUT->add_gui_object('uploadbox', $attrib['id']);
	return $out;
	}

	// similar function as in /steps/settings/edit_identity.inc
	function get_form_tags($attrib)
	{
	global $CONTACTS, $EDIT_FORM, $RCMAIL, $SOURCE_ID;

	$form_start = $form_end = '';

	if (empty($EDIT_FORM)) {
	$hiddenfields = new html_hiddenfield();

	if ($RCMAIL->action == 'edit')
	$hiddenfields->add(array('name' => '_source', 'value' => $SOURCE_ID));
	$hiddenfields->add(array('name' => '_gid', 'value' => $CONTACTS->group_id));

	if (($result = $CONTACTS->get_result()) && ($record = $result->first()))
	$hiddenfields->add(array('name' => '_cid', 'value' => $record['ID']));

	$form_start = $RCMAIL->output->request_form(array(
	'name' => "form", 'method' => "post",
	'task' => $RCMAIL->task, 'action' => 'save',
	'request' => 'save.'.intval($record['ID']),
	'noclose' => true) + $attrib, $hiddenfields->show());
	$form_end = !strlen($attrib['form']) ? '</form>' : '';

	$EDIT_FORM = !empty($attrib['form']) ? $attrib['form'] : 'form';
	$RCMAIL->output->add_gui_object('editform', $EDIT_FORM);
	}

	return array($form_start, $form_end);
	}

	function rcmail_source_selector($attrib)
	{
	global $RCMAIL, $SOURCE_ID;

	$sources_list = $RCMAIL->get_address_sources(true);

	if (count($sources_list) < 2) {
	$source = $sources_list[$SOURCE_ID];
	$hiddenfield = new html_hiddenfield(array('name' => '_source', 'value' => $SOURCE_ID));
	return html::span($attrib, Q($source['name']) . $hiddenfield->show());
	}

	$attrib['name'] = '_source';
	$attrib['onchange'] = JS_OBJECT_NAME . ".command('save', 'reload', this.form)";

	$select = new html_select($attrib);

	foreach ($sources_list as $source)
	$select->add($source['name'], $source['id']);

	return $select->show($SOURCE_ID);
	}


	$OUTPUT->add_handlers(array(
	'contactedithead' => 'rcmail_contact_edithead',
	'contacteditform' => 'rcmail_contact_editform',
	'contactphoto' => 'rcmail_contact_photo',
	'photouploadform' => 'rcmail_upload_photo_form',
	'sourceselector' => 'rcmail_source_selector',
	));

	if ($RCMAIL->action == 'add' && $OUTPUT->template_exists('contactadd'))
	$OUTPUT->send('contactadd');

	// this will be executed if no template for addcontact exists
	$OUTPUT->send('contactedit');
	diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
	index 6b3ebad08..0a5a02287 100644
	--- a/program/steps/addressbook/func.inc
	+++ b/program/steps/addressbook/func.inc
	@@ -1,728 +1,742 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/addressbook/func.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2007, The Roundcube Dev Team \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Provide addressbook functionality and GUI objects \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id$

	*/

	$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, 'limit' => 1, 'label' => rcube_label('name'), 'category' => 'main'),
	'firstname' => array('type' => 'text', 'size' => 19, 'limit' => 1, 'label' => rcube_label('firstname'), 'category' => 'main'),
	'surname' => array('type' => 'text', 'size' => 19, 'limit' => 1, 'label' => rcube_label('surname'), 'category' => 'main'),
	'email' => array('type' => 'text', 'size' => 40, 'label' => rcube_label('email'), 'subtypes' => array('home','work','other'), 'category' => 'main'),
	'middlename' => array('type' => 'text', 'size' => 19, 'limit' => 1, 'label' => rcube_label('middlename'), 'category' => 'main'),
	'prefix' => array('type' => 'text', 'size' => 8, 'limit' => 1, 'label' => rcube_label('nameprefix'), 'category' => 'main'),
	'suffix' => array('type' => 'text', 'size' => 8, 'limit' => 1, 'label' => rcube_label('namesuffix'), 'category' => 'main'),
	'nickname' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('nickname'), 'category' => 'main'),
	'jobtitle' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('jobtitle'), 'category' => 'main'),
	'organization' => array('type' => 'text', 'size' => 19, 'limit' => 1, 'label' => rcube_label('organization'), 'category' => 'main'),
	'department' => array('type' => 'text', 'size' => 19, '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, 'limit' => 1, 'label' => rcube_label('maidenname'), 'category' => 'personal'),
	'phone' => array('type' => 'text', 'size' => 40, '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, 'label' => rcube_label('street'), 'category' => 'main'),
	'locality' => array('type' => 'text', 'size' => 28, 'label' => rcube_label('locality'), 'category' => 'main'),
	'zipcode' => array('type' => 'text', 'size' => 8, 'label' => rcube_label('zipcode'), 'category' => 'main'),
	'region' => array('type' => 'text', 'size' => 12, 'label' => rcube_label('region'), 'category' => 'main'),
	'country' => array('type' => 'text', 'size' => 40, 'label' => rcube_label('country'), 'category' => 'main'),
	), 'category' => 'main'),
	'birthday' => array('type' => 'date', 'size' => 12, 'label' => rcube_label('birthday'), 'limit' => 1, 'render_func' => 'rcmail_format_date_col', 'category' => 'personal'),
	'anniversary' => array('type' => 'date', 'size' => 12, 'label' => rcube_label('anniversary'), 'limit' => 1, 'render_func' => 'rcmail_format_date_col', 'category' => 'personal'),
	'website' => array('type' => 'text', 'size' => 40, 'label' => rcube_label('website'), 'subtypes' => array('homepage','work','blog','other'), 'category' => 'main'),
	'im' => array('type' => 'text', 'size' => 40, 'label' => rcube_label('instantmessenger'), 'subtypes' => array('aim','icq','msn','yahoo','jabber','skype','other'), 'category' => 'main'),
	'notes' => array('type' => 'textarea', 'size' => 40, 'rows' => 15, 'label' => rcube_label('notes'), 'limit' => 1),
	'photo' => array('type' => 'image', 'limit' => 1, 'category' => 'main'),
	'assistant' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('assistant'), 'category' => 'personal'),
	'manager' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('manager'), 'category' => 'personal'),
	'spouse' => array('type' => 'text', 'size' => 40, 'limit' => 1, 'label' => rcube_label('spouse'), 'category' => 'personal'),
	// TODO: define fields for vcards like GEO, KEY
	);


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

	$source = get_input_value('_source', RCUBE_INPUT_GPC);

	// use first directory by default
	if (!strlen($source) \|\| !isset($js_list[$source]))
	$source = $js_list[key($js_list)]['id'];

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

	$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_pagetitle(rcube_label('addressbook'));
	$_SESSION['addressbooks_count'] = count($js_list);
	$_SESSION['addressbooks_count_writeable'] = $writeable;

	if (!strlen($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)
	{
	global $RCMAIL, $OUTPUT, $CONFIG, $CONTACT_COLTYPES;

	if (!strlen($source)) {
	$source = get_input_value('_source', RCUBE_INPUT_GPC);
	}

	if (!strlen($source)) {
	return null;
	}

	// Get object
	$CONTACTS = $RCMAIL->get_address_book($source);
	$CONTACTS->set_pagesize($CONFIG['pagesize']);

	// 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)
	$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_default_source($writable=false)
	{
	global $RCMAIL;

	// get list of address sources
	$list = $RCMAIL->get_address_sources($writable);

	// use first directory by default
	return $list[key($list)]['id'];
	}

	+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', $name);
	+ }
	+}
	+

	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->env['address_sources'];
	reset($sources);

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

	foreach ($sources as $j => $source) {
	$id = strval($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'];

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

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

	$OUTPUT->set_env('contactgroups', $jsdata);
	$OUTPUT->add_gui_object('folderlist', $attrib['id']);

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

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

	// 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 = $row[$col];
	if ($val == '' && $col == 'name') {
	$val = rcube_addressbook::compose_display_name($row, true);
	}
	$a_row_cols[$col] = Q($val);
	}

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


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

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

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

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

	return html::iframe($attrib);
	}


	function rcmail_rowcount_display($attrib)
	{
	global $OUTPUT;

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

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

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


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

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

	if ($result->count == 0)
	$out = rcube_label('nocontactsfound');
	else
	$out = rcube_label(array(
	'name' => 'contactsfromto',
	'vars' => array(
	'from' => $result->first + 1,
	'to' => min($result->count, $result->first + $CONFIG['pagesize']),
	'count' => $result->count)
	));

	return $out;
	}


	function rcmail_get_type_label($type)
	{
	$label = 'type'.$type;
	if (rcube_label_exists($label))
	return rcube_label($label);
	else if (preg_match('/\w+(\d+)$/', $label, $m)
	&& ($label = preg_replace('/(\d+)$/', '', $label))
	&& rcube_label_exists($label))
	return rcube_label($label) . ' ' . $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'),
	'jobnames' => array('organization','department','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[] = '';

	$rows = '';
	foreach ((array)$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) {
	$childvalue = $val[$childcol] ? $val[$childcol] : $val[$j];

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

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

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

	$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 (!$CONTACT_COLTYPES['photo'])
	return '';

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

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

	if (strpos($record['photo'], 'http:') === 0)
	$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 ($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'));
	}


	/**
	* Returns contact ID(s) and source(s) from GET/POST data
	*
	* @return array List of contact IDs per-source
	*/
	function rcmail_get_cids()
	{
	// 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 (!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) {
	// if _source is not specified we'll find it from decoded ID
	if (!$got_source) {
	list ($c, $s) = explode('-', $id, 2);
	if (strlen($s)) {
	$result[(string)$s][] = $c;
	}
	}
	else {
	$result[$source][] = $id;
	}
	}

	return $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',
	'upload-photo' => 'save.inc',
	'group-create' => 'groups.inc',
	'group-rename' => 'groups.inc',
	'group-delete' => 'groups.inc',
	'group-addmembers' => 'groups.inc',
	'group-delmembers' => 'groups.inc',
	));
	diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc
	index fc983e60b..729cb3487 100644
	--- a/program/steps/addressbook/show.inc
	+++ b/program/steps/addressbook/show.inc
	@@ -1,221 +1,215 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| program/steps/addressbook/show.inc \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2005-2009, The Roundcube Dev Team \|
	\| Licensed under the GNU GPL \|
	\| \|
	\| PURPOSE: \|
	\| Show contact details \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+

	$Id$

	*/

	// Get contact ID and source ID from request
	$cids = rcmail_get_cids();
	$source = key($cids);
	$cid = array_shift($cids[$source]);

	// Initialize addressbook source
	$CONTACTS = rcmail_contact_source($source, true);
	$SOURCE_ID = $source;

	// read contact record
	if ($cid && ($record = $CONTACTS->get_record($cid, true))) {
	$OUTPUT->set_env('cid', $record['ID']);
	}

	// get address book name (for display)
	-if ($_SESSION['addressbooks_count'] > 1) {
	- $name = $CONTACTS->get_name();
	- if (!$name && $source == 0) {
	- $name = rcube_label('personaladrbook');
	- }
	- $OUTPUT->set_env('sourcename', $name);
	-}
	+rcmail_set_sourcename($CONTACTS);

	// return raw photo of the given contact
	if ($RCMAIL->action == 'photo') {
	if (($file_id = get_input_value('_photo', RCUBE_INPUT_GPC)) && ($tempfile = $_SESSION['contacts']['files'][$file_id])) {
	$tempfile = $RCMAIL->plugins->exec_hook('attachment_display', $tempfile);
	if ($tempfile['status']) {
	if ($tempfile['data'])
	$data = $tempfile['data'];
	else if ($tempfile['path'])
	$data = file_get_contents($tempfile['path']);
	}
	}
	else if ($record['photo']) {
	$data = is_array($record['photo']) ? $record['photo'][0] : $record['photo'];
	if (!preg_match('![^a-z0-9/=+-]!i', $data))
	$data = base64_decode($data, true);
	}

	header('Content-Type: ' . rc_image_content_type($data));
	echo $data ? $data : file_get_contents('program/blank.gif');
	exit;
	}


	function rcmail_contact_head($attrib)
	{
	global $CONTACTS, $RCMAIL;

	// check if we have a valid result
	if (!(($result = $CONTACTS->get_result()) && ($record = $result->first()))) {
	$RCMAIL->output->show_message('contactnotfound');
	return false;
	}

	$microformats = array('name' => 'fn', 'email' => 'email');

	$form = array(
	'head' => array( // section 'head' is magic!
	'content' => array(
	'prefix' => array('type' => 'text'),
	'firstname' => array('type' => 'text'),
	'middlename' => array('type' => 'text'),
	'surname' => array('type' => 'text'),
	'suffix' => array('type' => 'text'),
	),
	),
	);

	unset($attrib['name']);
	return rcmail_contact_form($form, $record, $attrib);
	}


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

	// check if we have a valid result
	if (!(($result = $CONTACTS->get_result()) && ($record = $result->first()))) {
	//$RCMAIL->output->show_message('contactnotfound');
	return false;
	}

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

	$form = array(
	'contact' => array(
	'name' => rcube_label('contactproperties'),
	'content' => array(
	'email' => array('size' => $i_size, 'render_func' => 'rcmail_render_email_value'),
	'phone' => array('size' => $i_size),
	'address' => array(),
	'website' => array('size' => $i_size, 'render_func' => 'rcmail_render_url_value'),
	'im' => array('size' => $i_size),
	),
	),
	'personal' => array(
	'name' => rcube_label('personalinfo'),
	'content' => array(
	'gender' => array('size' => $i_size),
	'maidenname' => array('size' => $i_size),
	'birthday' => array('size' => $i_size),
	'anniversary' => array('size' => $i_size),
	'manager' => array('size' => $i_size),
	'assistant' => array('size' => $i_size),
	'spouse' => array('size' => $i_size),
	),
	),
	);

	if (isset($CONTACT_COLTYPES['notes'])) {
	$form['notes'] = array(
	'name' => rcube_label('notes'),
	'content' => array(
	'notes' => array('type' => 'textarea', 'label' => false),
	),
	);
	}

	if ($CONTACTS->groups) {
	$form['groups'] = array(
	'name' => rcube_label('groups'),
	'content' => rcmail_contact_record_groups($record['ID']),
	);
	}

	return rcmail_contact_form($form, $record);
	}


	function rcmail_render_email_value($email, $col)
	{
	return html::a(array(
	'href' => 'mailto:' . $email,
	'onclick' => sprintf("return %s.command('compose','%s',this)", JS_OBJECT_NAME, JQ($email)),
	'title' => rcube_label('composeto'),
	'class' => 'email',
	), Q($email));
	}


	function rcmail_render_url_value($url, $col)
	{
	$prefix = preg_match('!^(http\|ftp)s?://!', $url) ? '' : 'http://';
	return html::a(array(
	'href' => $prefix . $url,
	'target' => '_blank',
	'class' => 'url',
	), Q($url));
	}


	function rcmail_contact_record_groups($contact_id)
	{
	global $RCMAIL, $CONTACTS, $GROUPS;

	$GROUPS = $CONTACTS->list_groups();

	if (empty($GROUPS)) {
	return '';
	}

	$table = new html_table(array('cols' => 2, 'cellspacing' => 0, 'border' => 0));

	$members = $CONTACTS->get_record_groups($contact_id);
	$checkbox = new html_checkbox(array('name' => '_gid[]',
	'class' => 'groupmember', 'disabled' => $CONTACTS->readonly));

	foreach ($GROUPS as $group) {
	$gid = $group['ID'];
	$table->add(null, $checkbox->show($members[$gid] ? $gid : null,
	array('value' => $gid, 'id' => 'ff_gid' . $gid)));
	$table->add(null, html::label('ff_gid' . $gid, Q($group['name'])));
	}

	$hiddenfields = new html_hiddenfield(array('name' => '_source', 'value' => get_input_value('_source', RCUBE_INPUT_GPC)));
	$hiddenfields->add(array('name' => '_cid', 'value' => $record['ID']));

	$form_start = $RCMAIL->output->request_form(array(
	'name' => "form", 'method' => "post",
	'task' => $RCMAIL->task, 'action' => 'save',
	'request' => 'save.'.intval($contact_id),
	'noclose' => true), $hiddenfields->show());
	$form_end = '</form>';

	$RCMAIL->output->add_gui_object('editform', 'form');

	return $form_start . $table->show() . $form_end;
	}


	$OUTPUT->add_handlers(array(
	'contacthead' => 'rcmail_contact_head',
	'contactdetails' => 'rcmail_contact_details',
	'contactphoto' => 'rcmail_contact_photo',
	));

	$OUTPUT->send('contact');
	diff --git a/skins/default/addressbook.css b/skins/default/addressbook.css
	index 63c60c08a..69b913e84 100644
	--- a/skins/default/addressbook.css
	+++ b/skins/default/addressbook.css
	@@ -1,394 +1,394 @@
	/*** Roundcube\|Mail address book task styles ***/

	#abooktoolbar
	{
	position: absolute;
	top: 45px;
	left: 225px;
	height: 35px;
	}

	#abooktoolbar a
	{
	padding-right: 10px;
	}

	#abooktoolbar a.button,
	#abooktoolbar a.buttonPas,
	#abooktoolbar span.separator {
	display: block;
	float: left;
	width: 32px;
	height: 32px;
	padding: 0;
	margin-right: 10px;
	overflow: hidden;
	background: url(images/abook_toolbar.png) 0 0 no-repeat transparent;
	opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
	}

	#abooktoolbar a.buttonPas {
	opacity: 0.35;
	}

	#abooktoolbar a.addcontactSel {
	background-position: 0 -32px;
	}

	#abooktoolbar a.compose {
	background-position: -32px 0;
	}

	#abooktoolbar a.composeSel {
	background-position: -32px -32px;
	}

	#abooktoolbar a.delete {
	background-position: -64px 0;
	}

	#abooktoolbar a.deleteSel {
	background-position: -64px -32px;
	}

	#abooktoolbar a.import {
	background-position: -96px 0;
	}

	#abooktoolbar a.importSel {
	background-position: -96px -32px;
	}

	#abooktoolbar a.export {
	background-position: -128px 0;
	}

	#abooktoolbar a.exportSel {
	background-position: -128px -32px;
	}

	#abooktoolbar span.separator {
	width: 5px;
	background-position: -162px 0;
	}

	#abooktoolbar a.search {
	background-position: -170px 0;
	}

	#abooktoolbar a.searchSel {
	background-position: -170px -32px;
	}

	#abookcountbar
	{
	margin-top: 4px;
	margin-left: 4px;
	}

	#addressscreen
	{
	position: absolute;
	top: 0;
	right: 0;
	bottom: 0;
	left: 205px;
	}

	#directorylistbox
	{
	position: absolute;
	top: 0;
	bottom: 0;
	left: 0;
	width: 195px;
	border: 1px solid #999999;
	background-color: #F9F9F9;
	overflow: hidden;
	}

	#directorylistbox input
	{
	margin: 2px;
	width: 90%;
	}

	#addresslist
	{
	position: absolute;
	top: 0;
	bottom: 0;
	border: 1px solid #999999;
	background-color: #F9F9F9;
	overflow: hidden;
	}

	#contactgroupslist
	{
	border-top: 1px solid #999;
	}

	#addresslist
	{
	left: 0px;
	width: 280px;
	}

	#directorylist
	{
	list-style: none;
	margin: 0;
	padding: 0;
	background-color: #FFFFFF;
	}

	#directorylist li
	{
	display: block;
	font-size: 11px;
	background: url(images/icons/folders.png) 5px -108px no-repeat;
	border-bottom: 1px solid #EBEBEB;
	white-space: nowrap;
	}

	#directorylist li a
	{
	cursor: default;
	display: block;
	padding-left: 25px;
	padding-top: 2px;
	padding-bottom: 2px;
	text-decoration: none;
	white-space: nowrap;
	}

	#directorylist li.contactgroup
	{
	padding-left: 15px;
	background-position: 20px -144px;
	}

	#directorylist li.selected
	{
	background-color: #929292;
	border-bottom: 1px solid #898989;
	}

	#directorylist li.selected a
	{
	color: #FFF;
	font-weight: bold;
	}

	#directorylist li.droptarget
	{
	background-color: #FFFFA6;
	}

	#contacts-table
	{
	width: 100%;
	table-layout: fixed;
	}

	#contacts-table tbody td
	{
	cursor: default;
	text-overflow: ellipsis;
	-o-text-overflow: ellipsis;
	}

	#contacts-box
	{
	position: absolute;
	top: 0px;
	left: 290px;
	right: 0px;
	bottom: 0px;
	border: 1px solid #999999;
	overflow: hidden;
	}

	body.iframe,
	#contact-frame
	{
	background-color: #F2F2F2;
	border: none;
	min-height: 100%; /* Chrome 14 bug */
	}

	#contacttabs
	{
	position: relative;
	padding-bottom: 12px;
	}

	#contacttabs div.tabsbar {
	top: 0;
	left: 2px;
	}

	#contacttabs fieldset.tabbed {
	position: relative;
	top: 22px;
	min-height: 5em;
	}

	#contacthead
	{
	margin-bottom: 1em;
	border: 0;
	padding: 0;
	}

	#contacthead .names span.namefield,
	#contacthead .names input
	{
	font-size: 140%;
	}

	#contacthead .displayname span.namefield
	{
	font-size: 120%;
	}

	#contacthead span.nickname:before,
	#contacthead span.nickname:after,
	#contacthead input.ff_nickname:before,
	#contacthead input.ff_nickname:after
	{
	content: '"';
	}

	#contacthead input
	{
	margin-right: 6px;
	margin-bottom: 0.2em;
	}

	#contacthead .names input,
	#contacthead .addnames input,
	#contacthead .jobnames input
	{
	width: 180px;
	}

	#contacthead input.ff_prefix,
	#contacthead input.ff_suffix
	{
	width: 90px;
	}

	#contacthead .addnames input.ff_name
	{
	width: 374px;
	}

	#contactphoto
	{
	float: right;
	width: 60px;
	margin-left: 3em;
	margin-right: 4px;
	}

	#contactpic
	{
	width: 60px;
	min-height: 60px;
	border: 1px solid #ccc;
	background: white;
	}

	#contactpic img {
	width: 60px;
	}

	#contactphoto .formlinks
	{
	margin-top: 0.5em;
	text-align: center;
	}

	fieldset.contactfieldgroup
	{
	border: 0;
	margin: 0.5em 0;
	padding: 0.2em 2px;
	}

	fieldset.contactfieldgroupmulti
	{
	padding: 0.5em 2px;
	}

	fieldset.contactfieldgroup legend
	{
	font-size: 0.9em;
	}

	.contactfieldgroup .row
	{
	position: relative;
	margin: 0.2em 0;
	}

	.contactfieldgroup .contactfieldlabel
	{
	position: absolute;
	top: 0;
	left: 2px;
	width: 110px;
	white-space: nowrap;
	overflow: hidden;
	text-overflow: ellipsis;
	color: #666;
	font-weight: bold;
	}

	.contactfieldgroup .contactfieldlabel select
	{
	width: 100%;
	background: none;
	border: 0;
	color: #666;
	font-weight: bold;
	padding-left: 0;
	}

	.contactfieldgroup .contactfieldcontent
	{
	padding-left: 120px;
	min-height: 1em;
	line-height: 1.3em;
	}

	.contactfieldgroup .contactfield {
	line-height: 1.3em;
	}

	.contactcontrolleraddress .contactfieldcontent input {
	margin-bottom: 0.1em;
	}

	.contactfieldcontent .contactfieldbutton {
	vertical-align: middle;
	margin-left: 0.5em;
	}

	#upload-form
	{
	padding: 6px;
	}

	#upload-form div
	{
	padding: 2px;
	}

	#sourcename
	{
	color: #666;
	font-size: 10px;
	- margin-left: 2px;
	+ margin: -5px 0 8px 2px;
	}
	diff --git a/skins/default/templates/contactadd.html b/skins/default/templates/contactadd.html
	index 305940afd..67b7bcd6e 100644
	--- a/skins/default/templates/contactadd.html
	+++ b/skins/default/templates/contactadd.html
	@@ -1,40 +1,40 @@
	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
	<title><roundcube:object name="pagetitle" /></title>
	<roundcube:include file="/includes/links.html" />
	<script type="text/javascript" src="/functions.js"></script>
	</head>
	<body class="iframe" onload="rcube_init_mail_ui()">

	<div id="contact-title" class="boxtitle"><roundcube:label name="addcontact" /></div>
	<div id="contact-details" class="boxcontent">
	<form name="editform" method="post" action="./">
	- <div id="sourcename" style="height: 20px">
	- <roundcube:label name="addressbook" />: <roundcube:object name="sourceselector" class="hint" id="sourceselect" />
	- </div>
	+ <roundcube:if condition="strlen(env:sourcename)" />
	+ <div id="sourcename"><roundcube:label name="addressbook" />: <roundcube:object name="sourceselector" class="hint" id="sourceselect" /></div>
	+ <roundcube:endif />
	<div id="contactphoto">
	<roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" />
	<div class="formlinks">
	<roundcube:button command="upload-photo" id="uploadformlink" type="link" label="addphoto" class="disabled" classAct="active" onclick="rcmail_ui.show_popup('uploadform', true);return false" condition="env:photocol" /><br/>
	<roundcube:button command="delete-photo" type="link" label="delete" class="disabled" classAct="active" condition="env:photocol" />
	</div>
	</div>
	<roundcube:object name="contactedithead" id="contacthead" size="16" form="editform" />
	<div style="clear:both"></div>
	<div id="contacttabs">
	<roundcube:object name="contacteditform" size="40" textareacols="60" deleteIcon="/images/icons/delete.png" form="editform" />
	</div>
	<p>
	<input type="button" value="<roundcube:label name="cancel" />" class="button" onclick="history.back()" />
	<roundcube:button command="save" type="input" class="button mainaction" label="save" />
	</p>
	</form>
	</div>

	<roundcube:object name="photoUploadForm" id="upload-form" size="30" class="popupmenu" />

	<script type="text/javascript">rcube_init_tabs('contacttabs')</script>

	</body>
	</html>
	diff --git a/skins/default/templates/contactedit.html b/skins/default/templates/contactedit.html
	index 681201caa..77e466141 100644
	--- a/skins/default/templates/contactedit.html
	+++ b/skins/default/templates/contactedit.html
	@@ -1,38 +1,41 @@
	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
	<title><roundcube:object name="pagetitle" /></title>
	<roundcube:include file="/includes/links.html" />
	<script type="text/javascript" src="/functions.js"></script>
	</head>
	<body class="iframe" onload="rcube_init_mail_ui()">

	<div id="contact-title" class="boxtitle"><roundcube:label name="editcontact" /></div>
	<div id="contact-details" class="boxcontent">
	<form name="editform" method="post" action="./">
	+ <roundcube:if condition="strlen(env:sourcename)" />
	+ <div id="sourcename"><roundcube:label name="addressbook" />: <roundcube:var name="env:sourcename" /></div>
	+ <roundcube:endif />
	<div id="contactphoto">
	<roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" />
	<div class="formlinks">
	<roundcube:button command="upload-photo" id="uploadformlink" type="link" label="replacephoto" class="disabled" classAct="active" onclick="rcmail_ui.show_popup('uploadform', true);return false" condition="env:photocol" /><br/>
	<roundcube:button command="delete-photo" type="link" label="delete" class="disabled" classAct="active" condition="env:photocol" />
	</div>
	</div>
	<roundcube:object name="contactedithead" id="contacthead" size="16" form="editform" />
	<div style="clear:both"></div>

	<div id="contacttabs">
	<roundcube:object name="contacteditform" size="40" textareacols="60" deleteIcon="/images/icons/delete.png" form="editform" />
	</div>
	<p>
	<roundcube:button command="show" type="input" class="button" label="cancel" />
	<roundcube:button command="save" type="input" class="button mainaction" label="save" />
	</p>
	</form>
	</div>

	<roundcube:object name="photoUploadForm" id="upload-form" size="30" class="popupmenu" />

	<script type="text/javascript">rcube_init_tabs('contacttabs')</script>

	</body>
	</html>

File Metadata

Mime Type: text/x-diff
Expires: Mon, Sep 7, 9:09 AM (1 d, 18 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1355900
Default Alt Text: (58 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions