diff --git a/addressbook/inc/class.addressbook_merge.inc.php b/addressbook/inc/class.addressbook_merge.inc.php index 718f21fe4c..5979d77ab5 100644 --- a/addressbook/inc/class.addressbook_merge.inc.php +++ b/addressbook/inc/class.addressbook_merge.inc.php @@ -54,6 +54,10 @@ class addressbook_merge extends bo_merge '$$attachments$$' => $this->get_links('addressbook', $id, egw_link::VFS_APPNAME), '$$links_attachments$$' => $this->get_links('addressbook', $id) ); + foreach(array_keys($GLOBALS['egw_info']['user']['apps']) as $app) + { + $array['$$links/'.$app.'$$'] = $this->get_links('addressbook',$id, $app); + } if (!(strpos($content,'$$calendar/') === false)) { $replacements += $this->calendar_replacements($id,!(strpos($content,'$$calendar/-1/') === false)); @@ -182,6 +186,7 @@ class addressbook_merge extends bo_merge 'links' => lang('Titles of any entries linked to the current record, excluding attached files'), 'attachments' => lang('List of files linked to the current record'), 'links_attachments' => lang('Links and attached files'), + 'links/[appname]' => lang('Links to specified application. Example: {{links/infolog}}'), 'date' => lang('Date'), 'user/n_fn' => lang('Name of current user, all other contact fields are valid too'), 'user/account_lid' => lang('Username'), diff --git a/calendar/inc/class.calendar_merge.inc.php b/calendar/inc/class.calendar_merge.inc.php index 08ad5626ca..e9656ed657 100644 --- a/calendar/inc/class.calendar_merge.inc.php +++ b/calendar/inc/class.calendar_merge.inc.php @@ -212,6 +212,10 @@ class calendar_merge extends bo_merge $replacements['$$'.($prefix?$prefix.'/':'').'links$$'] = $this->get_links('calendar', $event['id'], '!'.egw_link::VFS_APPNAME); $replacements['$$'.($prefix?$prefix.'/':'').'attachments$$'] = $this->get_links('calendar', $event['id'], egw_link::VFS_APPNAME); $replacements['$$'.($prefix?$prefix.'/':'').'links_attachments$$'] = $this->get_links('calendar', $event['id']); + foreach(array_keys($GLOBALS['egw_info']['user']['apps']) as $app) + { + $array["$$".($prefix?$prefix.'/':'')."links/{$app}$$"] = $this->get_links('calendar',$id, $app); + } return $replacements; } @@ -572,6 +576,7 @@ class calendar_merge extends bo_merge 'links' => lang('Titles of any entries linked to the current record, excluding attached files'), 'attachments' => lang('List of files linked to the current record'), 'links_attachments' => lang('Links and attached files'), + 'links/[appname]' => lang('Links to specified application. Example: {{links/infolog}}'), 'date' => lang('Date'), 'user/n_fn' => lang('Name of current user, all other contact fields are valid too'), 'user/account_lid' => lang('Username'), diff --git a/timesheet/inc/class.timesheet_merge.inc.php b/timesheet/inc/class.timesheet_merge.inc.php index ad0b280825..f13c08c17b 100644 --- a/timesheet/inc/class.timesheet_merge.inc.php +++ b/timesheet/inc/class.timesheet_merge.inc.php @@ -128,6 +128,10 @@ class timesheet_merge extends bo_merge $array['links'] = $this->get_links('timesheet', $id, '!'.egw_link::VFS_APPNAME); $array['attachments'] = $this->get_links('timesheet', $id, egw_link::VFS_APPNAME); $array['links_attachments'] = $this->get_links('timesheet', $id); + foreach(array_keys($GLOBALS['egw_info']['user']['apps']) as $app) + { + $array["$$".($prefix?$prefix.'/':'')."links/{$app}$$"] = $this->get_links('timesheet',$id, $app); + } // Add markers foreach($array as $key => &$value) @@ -190,6 +194,7 @@ class timesheet_merge extends bo_merge 'links' => lang('Titles of any entries linked to the current record, excluding attached files'), 'attachments' => lang('List of files linked to the current record'), 'links_attachments' => lang('Links and attached files'), + 'links/[appname]' => lang('Links to specified application. Example: {{links/infolog}}'), 'date' => lang('Date'), 'user/n_fn' => lang('Name of current user, all other contact fields are valid too'), 'user/account_lid' => lang('Username'),