holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add mergeprint tag for links to a specified application: links/appname

Browse Source
This commit is contained in:
Nathan Gray 2012-01-06 18:35:34 +00:00
parent 2a2880dd75
commit 02861daf88
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,6 +54,10 @@ class addressbook_merge extends bo_merge
'$$attachments$$' => $this->get_links('addressbook', $id, egw_link::VFS_APPNAME), '$$attachments$$' => $this->get_links('addressbook', $id, egw_link::VFS_APPNAME),
'$$links_attachments$$' => $this->get_links('addressbook', $id) '$$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)) if (!(strpos($content,'$$calendar/') === false))
{ {
$replacements += $this->calendar_replacements($id,!(strpos($content,'$$calendar/-1/') === 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'), 'links' => lang('Titles of any entries linked to the current record, excluding attached files'),
'attachments' => lang('List of files linked to the current record'), 'attachments' => lang('List of files linked to the current record'),
'links_attachments' => lang('Links and attached files'), 'links_attachments' => lang('Links and attached files'),
'links/[appname]' => lang('Links to specified application. Example: {{links/infolog}}'),
'date' => lang('Date'), 'date' => lang('Date'),
'user/n_fn' => lang('Name of current user, all other contact fields are valid too'), 'user/n_fn' => lang('Name of current user, all other contact fields are valid too'),
'user/account_lid' => lang('Username'), 'user/account_lid' => lang('Username'),

5
calendar/inc/class.calendar_merge.inc.php
View File

@ -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.'/':'').'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.'/':'').'attachments$$'] = $this->get_links('calendar', $event['id'], egw_link::VFS_APPNAME);
$replacements['$$'.($prefix?$prefix.'/':'').'links_attachments$$'] = $this->get_links('calendar', $event['id']); $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; 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'), 'links' => lang('Titles of any entries linked to the current record, excluding attached files'),
'attachments' => lang('List of files linked to the current record'), 'attachments' => lang('List of files linked to the current record'),
'links_attachments' => lang('Links and attached files'), 'links_attachments' => lang('Links and attached files'),
'links/[appname]' => lang('Links to specified application. Example: {{links/infolog}}'),
'date' => lang('Date'), 'date' => lang('Date'),
'user/n_fn' => lang('Name of current user, all other contact fields are valid too'), 'user/n_fn' => lang('Name of current user, all other contact fields are valid too'),
'user/account_lid' => lang('Username'), 'user/account_lid' => lang('Username'),

5
timesheet/inc/class.timesheet_merge.inc.php
View File

@ -128,6 +128,10 @@ class timesheet_merge extends bo_merge
$array['links'] = $this->get_links('timesheet', $id, '!'.egw_link::VFS_APPNAME); $array['links'] = $this->get_links('timesheet', $id, '!'.egw_link::VFS_APPNAME);
$array['attachments'] = $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); $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 // Add markers
foreach($array as $key => &$value) 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'), 'links' => lang('Titles of any entries linked to the current record, excluding attached files'),
'attachments' => lang('List of files linked to the current record'), 'attachments' => lang('List of files linked to the current record'),
'links_attachments' => lang('Links and attached files'), 'links_attachments' => lang('Links and attached files'),
'links/[appname]' => lang('Links to specified application. Example: {{links/infolog}}'),
'date' => lang('Date'), 'date' => lang('Date'),
'user/n_fn' => lang('Name of current user, all other contact fields are valid too'), 'user/n_fn' => lang('Name of current user, all other contact fields are valid too'),
'user/account_lid' => lang('Username'), 'user/account_lid' => lang('Username'),