extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

fill displayname for contacts and task to easier identify it in autoindex

Browse Source
This commit is contained in:
Ralf Becker 2012-01-31 00:37:01 +00:00
parent 1dd3a9e083
commit 1f93855172
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addressbook/inc/class.addressbook_groupdav.inc.php
View File

@ -183,7 +183,7 @@ class addressbook_groupdav extends groupdav_handler
} }
$files = array(); $files = array();
// we query etag and modified, as LDAP does not have the strong sql etag // 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 (!in_array(self::$path_attr,$cols)) $cols[] = self::$path_attr;
if (($contacts =& $this->bo->search(array(),$cols,$order,'','',False,'AND',$start,$filter))) if (($contacts =& $this->bo->search(array(),$cols,$order,'','',False,'AND',$start,$filter)))
{ {
@ -191,6 +191,8 @@ class addressbook_groupdav extends groupdav_handler
{ {
$props = array( $props = array(
'getcontenttype' => HTTP_WebDAV_Server::mkprop('getcontenttype', 'text/vcard'), 'getcontenttype' => HTTP_WebDAV_Server::mkprop('getcontenttype', 'text/vcard'),
'getlastmodified' => $contact['modified'],
'displayname' => $contact['n_fn'],
); );
if ($address_data) if ($address_data)
{ {

3
infolog/inc/class.infolog_groupdav.inc.php
View File

@ -212,7 +212,7 @@ class infolog_groupdav extends groupdav_handler
if (!$calendar_data) 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)) if (is_array($start))
@ -235,6 +235,7 @@ class infolog_groupdav extends groupdav_handler
$props = array( $props = array(
'getcontenttype' => $this->agent != 'kde' ? 'text/calendar; charset=utf-8; component=VTODO' : 'text/calendar', // Konqueror (3.5) dont understand it otherwise 'getcontenttype' => $this->agent != 'kde' ? 'text/calendar; charset=utf-8; component=VTODO' : 'text/calendar', // Konqueror (3.5) dont understand it otherwise
'getlastmodified' => $task['info_datemodified'], 'getlastmodified' => $task['info_datemodified'],
'displayname' => $task['info_subject'],
); );
if ($calendar_data) if ($calendar_data)
{ {