extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-23 03:11:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

- $$calendar/-1/...$$ for data of the last event

Browse Source 
- showing a category path (full cat hierarchy), if category tree is configured
- deleting placeholders of empty (not-stored) custom fields
This commit is contained in:
Ralf Becker 2008-02-07 02:45:48 +00:00
parent b2be83b0da
commit 9eaa3efb75
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
addressbook/inc/class.addressbook_merge.inc.php
View File

@ -90,10 +90,12 @@ class addressbook_merge // extends bo_merge
require_once(EGW_API_INC.'/class.categories.inc.php'); require_once(EGW_API_INC.'/class.categories.inc.php');
$GLOBALS['egw']->cats =& new categories; $GLOBALS['egw']->cats =& new categories;
} }
// if cat-tree is displayed, we return a full category path not just the name of the cat
$use = $GLOBALS['egw_info']['server']['cat_tab'] == 'Tree' ? 'path' : 'name';
$cats = array(); $cats = array();
foreach(is_array($value) ? $value : explode(',',$value) as $cat_id) foreach(is_array($value) ? $value : explode(',',$value) as $cat_id)
{ {
$cats[] = $GLOBALS['egw']->cats->id2name($cat_id); $cats[] = $GLOBALS['egw']->cats->id2name($cat_id,$use);
} }
$value = implode(', ',$cats); $value = implode(', ',$cats);
} }
@ -121,30 +123,50 @@ class addressbook_merge // extends bo_merge
} }
if ($name != 'photo') $replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] = $value; if ($name != 'photo') $replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] = $value;
} }
// set all not yet set custom fields, as empty cf's are not stored!
foreach(array_keys($this->contacts->customfields) as $name)
{
if (!isset($replacements[$name]))
{
$replacements[$name] = '';
}
}
return $replacements; return $replacements;
} }
/** /**
* Return replacements for the calendar (next events) of a contact * Return replacements for the calendar (next events) of a contact
* *
* ToDo: not yet implemented!!!
*
* @param int $contact contact-id * @param int $contact contact-id
* @param boolean $last_event_too=false also include information about the last event
* @return array * @return array
*/ */
function calendar_replacements($id) function calendar_replacements($id,$last_event_too=false)
{ {
require_once(EGW_INCLUDE_ROOT.'/calendar/inc/class.bocalupdate.inc.php'); require_once(EGW_INCLUDE_ROOT.'/calendar/inc/class.bocalupdate.inc.php');
$calendar =& new bocalupdate(); $calendar =& new bocalupdate();
$replacements = array(); $n = 1; // next events
foreach($calendar->search(array( $events = $calendar->search(array(
'start' => $calendar->now_su, 'start' => $calendar->now_su,
'users' => 'c'.$id, 'users' => 'c'.$id,
'offset' => 0, 'offset' => 0,
'num_rows' => 20, 'num_rows' => 20,
'order' => 'cal_start', 'order' => 'cal_start',
)) as $event) ));
array_unshift($events,false); unset($events[0]); // renumber the array to start with key 1, instead of 0
if ($last_event_too)
{
list($events['-1']) = $calendar->search(array(
'end' => $calendar->now_su,
'users' => 'c'.$id,
'offset' => 0,
'num_rows' => 1,
'order' => 'cal_start DESC',
));
}
$replacements = array();
foreach($events as $n => $event)
{ {
foreach($calendar->event2array($event) as $name => $data) foreach($calendar->event2array($event) as $name => $data)
{ {
@ -209,7 +231,7 @@ class addressbook_merge // extends bo_merge
} }
if (strpos($content,'$$calendar/') !== null) if (strpos($content,'$$calendar/') !== null)
{ {
$replacements += $this->calendar_replacements($id); $replacements += $this->calendar_replacements($id,strpos($content,'$$calendar/-1/') !== null);
} }
$replacements['$$date$$'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],time()+$this->contacts->tz_offset_s); $replacements['$$date$$'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],time()+$this->contacts->tz_offset_s);