From 1f93855172136e8b38e3c4a4b259fc010e5a0606 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 31 Jan 2012 00:37:01 +0000 Subject: [PATCH] fill displayname for contacts and task to easier identify it in autoindex --- addressbook/inc/class.addressbook_groupdav.inc.php | 4 +++- infolog/inc/class.infolog_groupdav.inc.php | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/addressbook/inc/class.addressbook_groupdav.inc.php b/addressbook/inc/class.addressbook_groupdav.inc.php index 3c017407aa..f89a1b9671 100644 --- a/addressbook/inc/class.addressbook_groupdav.inc.php +++ b/addressbook/inc/class.addressbook_groupdav.inc.php @@ -183,7 +183,7 @@ class addressbook_groupdav extends groupdav_handler } $files = array(); // we query etag and modified, as LDAP does not have the strong sql etag - $cols = array('id','uid','etag','modified'); + $cols = array('id','uid','etag','modified','n_fn'); if (!in_array(self::$path_attr,$cols)) $cols[] = self::$path_attr; if (($contacts =& $this->bo->search(array(),$cols,$order,'','',False,'AND',$start,$filter))) { @@ -191,6 +191,8 @@ class addressbook_groupdav extends groupdav_handler { $props = array( 'getcontenttype' => HTTP_WebDAV_Server::mkprop('getcontenttype', 'text/vcard'), + 'getlastmodified' => $contact['modified'], + 'displayname' => $contact['n_fn'], ); if ($address_data) { diff --git a/infolog/inc/class.infolog_groupdav.inc.php b/infolog/inc/class.infolog_groupdav.inc.php index 4fc64b5c78..c233de169a 100644 --- a/infolog/inc/class.infolog_groupdav.inc.php +++ b/infolog/inc/class.infolog_groupdav.inc.php @@ -212,7 +212,7 @@ class infolog_groupdav extends groupdav_handler if (!$calendar_data) { - $query['cols'] = array('info_id', 'info_datemodified', 'info_uid', 'caldav_name'); + $query['cols'] = array('info_id', 'info_datemodified', 'info_uid', 'caldav_name', 'info_subject'); } if (is_array($start)) @@ -235,6 +235,7 @@ class infolog_groupdav extends groupdav_handler $props = array( 'getcontenttype' => $this->agent != 'kde' ? 'text/calendar; charset=utf-8; component=VTODO' : 'text/calendar', // Konqueror (3.5) dont understand it otherwise 'getlastmodified' => $task['info_datemodified'], + 'displayname' => $task['info_subject'], ); if ($calendar_data) {