extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-05 04:49:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

allow all fileas types as link-title types (plus value of fileas)

Browse Source
This commit is contained in:
Ralf Becker 2010-11-10 09:35:10 +00:00
parent f767742f67
commit 87d4cbcce3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addressbook/inc/class.addressbook_bo.inc.php
View File

@ -36,6 +36,9 @@ class addressbook_bo extends addressbook_so
'org_name: n_family, n_prefix', 'org_name: n_family, n_prefix',
'org_name: n_given n_family', 'org_name: n_given n_family',
'org_name: n_fn', 'org_name: n_fn',
'org_name, org_unit: n_family, n_given',
'org_name, adr_one_locality: n_family, n_given',
'org_name, org_unit, adr_one_locality: n_family, n_given',
'n_family, n_given: org_name', 'n_family, n_given: org_name',
'n_family, n_given (org_name)', 'n_family, n_given (org_name)',
'n_family, n_prefix: org_name', 'n_family, n_prefix: org_name',

9
addressbook/inc/class.addressbook_hooks.inc.php
View File

@ -189,17 +189,14 @@ class addressbook_hooks
'forced' => false, 'forced' => false,
); );
} }
$fileas_options = ExecMethod('addressbook.addressbook_bo.fileas_options');
$settings['link_title'] = array( $settings['link_title'] = array(
'type' => 'select', 'type' => 'select',
'label' => 'Link title for contacts show', 'label' => 'Link title for contacts show',
'name' => 'link_title', 'name' => 'link_title',
'values' => array( 'values' => array(
'n_fileas' => lang('own sorting').' ('.lang('default').': '.lang('Company').': '.lang('lastname').', '.lang('firstname').')', 'n_fileas' => lang('own sorting').' ('.lang('default').': '.lang('Company').': '.lang('lastname').', '.lang('firstname').')',
'org_name: n_family, n_given' => lang('Company').': '.lang('lastname').', '.lang('firstname'), )+$fileas_options, // plus all fileas types
'org_name, org_unit: n_family, n_given' => lang('Company').', '.lang('Department').': '.lang('lastname').', '.lang('firstname'),
'org_name, adr_one_locality: n_family, n_given' => lang('Company').', '.lang('City').': '.lang('lastname').', '.lang('firstname'),
'org_name, org_unit, adr_one_locality: n_family, n_given' => lang('Company').', '.lang('Department').', '.lang('City').': '.lang('lastname').', '.lang('firstname'),
),
'help' => 'What should links to the addressbook display in other applications. Empty values will be left out. You need to log in anew, if you change this setting!', 'help' => 'What should links to the addressbook display in other applications. Empty values will be left out. You need to log in anew, if you change this setting!',
'xmlrpc' => True, 'xmlrpc' => True,
'admin' => false, 'admin' => false,
@ -222,7 +219,7 @@ class addressbook_hooks
'type' => 'select', 'type' => 'select',
'label' => 'Default file as format', 'label' => 'Default file as format',
'name' => 'fileas_default', 'name' => 'fileas_default',
'values' => ExecMethod('addressbook.addressbook_bo.fileas_options'), 'values' => $fileas_options,
'help' => 'Default format for fileas, eg. for new entries.', 'help' => 'Default format for fileas, eg. for new entries.',
'xmlrpc' => True, 'xmlrpc' => True,
'admin' => false, 'admin' => false,