diff --git a/addressbook/inc/class.addressbook_hooks.inc.php b/addressbook/inc/class.addressbook_hooks.inc.php index 4bed8456d2..0805aad50e 100644 --- a/addressbook/inc/class.addressbook_hooks.inc.php +++ b/addressbook/inc/class.addressbook_hooks.inc.php @@ -317,6 +317,18 @@ class addressbook_hooks 'default'=> isset($options[$default_def]) ? $default_def : false, ); } + if ($GLOBALS['egw_info']['user']['apps']['felamimail']) + { + $settings['force_mailto'] = array( + 'type' => 'check', + 'label' => 'Open EMail addresses in external mail program', + 'name' => 'force_mailto', + 'help' => 'Default is to open EMail addresses in EGroupware EMail application, if user has access to it.', + 'xmlrpc' => True, + 'admin' => False, + 'default'=> false, + ); + } return $settings; } diff --git a/addressbook/lang/egw_de.lang b/addressbook/lang/egw_de.lang index a5c7ca1ed6..a12f8916d5 100644 --- a/addressbook/lang/egw_de.lang +++ b/addressbook/lang/egw_de.lang @@ -140,6 +140,7 @@ default document to insert contacts addressbook de Standarddokument zum Einfüge default file as format addressbook de Vorgabe 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 +default is to open email addresses in egroupware email application, if user has access to it. addressbook de Vorgabe ist EMail Adressen in EGroupware's EMail Anwendung zu öffnen, wenn der Benutzer darauf Zugriff hat. 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 E-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! @@ -296,6 +297,7 @@ no fallback addressbook de Keine Ausweichlösung no vcard addressbook de Keine VCard number addressbook de Nummer number of records to read (%1) addressbook de Anzahl der einzulesenden Datensätze (%1) +open email addresses in external mail program addressbook de Öffne EMail Adressen in externem Mail Programm options for type admin de Optionen für Typ organisation addressbook de Organisation organisations addressbook de Organisationen diff --git a/addressbook/lang/egw_en.lang b/addressbook/lang/egw_en.lang index 2bbf371320..088655e89d 100644 --- a/addressbook/lang/egw_en.lang +++ b/addressbook/lang/egw_en.lang @@ -140,6 +140,7 @@ default document to insert contacts addressbook en Default document to insert co 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. +default is to open email addresses in egroupware email application, if user has access to it. addressbook en Default is to open EMail addresses in EGroupware EMail application, if user has access to it. defines which email address (business or home) to use as the preferred one for distribution lists in mail. addressbook en Which email address is used as preferred one for distribution lists. 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! @@ -296,6 +297,7 @@ no fallback addressbook en No fallback no vcard addressbook en No vCard number addressbook en Number number of records to read (%1) addressbook en Number of records to read (%1) +open email addresses in external mail program addressbook en Open EMail addresses in external mail program options for type admin en Options for type organisation addressbook en Organisation organisations addressbook en Organisations diff --git a/etemplate/inc/class.url_widget.inc.php b/etemplate/inc/class.url_widget.inc.php index d3a1f95589..a4ad023eb8 100644 --- a/etemplate/inc/class.url_widget.inc.php +++ b/etemplate/inc/class.url_widget.inc.php @@ -205,14 +205,17 @@ class url_widget { if (!$email || strpos($email,'@') === false) return ''; - if($GLOBALS['egw_info']['user']['apps']['felamimail']) + if (!$GLOBALS['egw_info']['user']['preferences']['addressbook']['force_mailto']) { - //return 'felamimail.uicompose.compose&preset[to]='.($rfc822 ? $rfc822 : $email); - return 'felamimail.uicompose.compose&send_to='.base64_encode($rfc822 ? $rfc822 : $email); - } - if($GLOBALS['egw_info']['user']['apps']['email']) - { - return 'email.uicompose.compose&to='.$email; + if($GLOBALS['egw_info']['user']['apps']['felamimail']) + { + //return 'felamimail.uicompose.compose&preset[to]='.($rfc822 ? $rfc822 : $email); + return 'felamimail.uicompose.compose&send_to='.base64_encode($rfc822 ? $rfc822 : $email); + } + if($GLOBALS['egw_info']['user']['apps']['email']) + { + return 'email.uicompose.compose&to='.$email; + } } return 'mailto:' . $email; }