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

default format for fileas

Browse Source
This commit is contained in:
Ralf Becker 2008-10-10 11:25:35 +00:00
parent 90dbfd6a37
commit db52734dd1
5 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@ class addressbook_bo extends addressbook_so
'org_name: n_given n_family',
'org_name: n_fn',
'n_family, n_given: org_name',
'n_family, n_given (org_name)',
'n_family, n_prefix: org_name',
'n_given n_family: org_name',
'n_prefix n_family: org_name',
@ -255,7 +256,7 @@ class addressbook_bo extends addressbook_so
function fileas($contact,$type=null)
{
if (is_null($type)) $type = $contact['fileas_type'];
if (!$type) $type = $this->fileas_types[0];
if (!$type) $type = $this->prefs['fileas_default'] ? $this->prefs['fileas_default'] : $this->fileas_types[0];
if (strpos($type,'n_fn') !== false) $contact['n_fn'] = $this->fullname($contact);
@ -293,7 +294,7 @@ class addressbook_bo extends addressbook_so
}
}
}
return $this->fileas_types[0];
return $this->prefs['fileas_default'] ? $this->prefs['fileas_default'] : $this->fileas_types[0];
}
/**

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

@ -202,6 +202,15 @@ class addressbook_hooks
'xmlrpc' => True,
'admin' => false,
);
$GLOBALS['settings']['fileas_default'] = array(
'type' => 'select',
'label' => 'Default file as format',
'name' => 'fileas_default',
'values' => ExecMethod('addressbook.addressbook_bo.fileas_options'),
'help' => 'Default format for fileas, eg. for new entries.',
'xmlrpc' => True,
'admin' => false,
);
$GLOBALS['settings']['hide_accounts'] = array(
'type' => 'check',
'label' => 'Hide accounts from addressbook',

10
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -1326,10 +1326,14 @@ class addressbook_ui extends addressbook_bo
{
$content = $this->read_org($state['org_view']);
}
elseif ($GLOBALS['egw_info']['user']['preferences']['common']['country'])
else
{
$content['adr_one_countryname'] =
$GLOBALS['egw']->country->get_full_name($GLOBALS['egw_info']['user']['preferences']['common']['country']);
if ($GLOBALS['egw_info']['user']['preferences']['common']['country'])
{
$content['adr_one_countryname'] =
$GLOBALS['egw']->country->get_full_name($GLOBALS['egw_info']['user']['preferences']['common']['country']);
}
if ($this->prefs['fileas_default']) $content['fileas_type'] = $this->prefs['fileas_default'];
}
if (isset($_GET['owner']) && $_GET['owner'] !== '')
{

2
addressbook/setup/egw_de.lang
View File

@ -122,7 +122,9 @@ default addressbook de Standard
default address format addressbook de Vorgabe für Format der Adresse
default addressbook for adding contacts addressbook de Vorgabe Adressbuch beim Hinzufügen von Kontakten
default document to insert contacts addressbook de Standarddokument zum Einfügen von Kontakten
default file as format addressbook de Vorgage für eigene Sortierung
default filter addressbook de Standardfilter
default format for fileas, eg. for new entries. addressbook de Vorgegebenes Format für eigene Sortierung, z.B. für neue Einträge
defines which email address (business or home) to use as the preferred one for distribution lists in mail. addressbook de Legt fest, welche E-Mailadresse (geschäftlich oder privat) für Verteilerlisten in Mail bevorzugt benutzt werden soll.
delete a single entry by passing the id. addressbook de Löscht einen einzelnen Eintrag durch Übergabe seiner ID.
delete selected distribution list! addressbook de Löscht die ausgewählten Verteilerliste!

2
addressbook/setup/egw_en.lang
View File

@ -122,7 +122,9 @@ default addressbook en default
default address format addressbook en Default address format
default addressbook for adding contacts addressbook en Default addressbook for adding contacts
default document to insert contacts addressbook en Default document to insert contacts
default file as format addressbook en Default file as format
default filter addressbook en Default Filter
default format for fileas, eg. for new entries. addressbook en Default format for fileas, eg. for new entries.
defines which email address (business or home) to use as the preferred one for distribution lists in mail. addressbook en Defines which email address (business or home) to use as the preferred one for distribution lists in mail.
delete a single entry by passing the id. addressbook en Delete a single entry by passing the id.
delete selected distribution list! addressbook en Delete selected distribution list!