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

use mail instead of felamimail (when available) for mail actions

Browse Source
This commit is contained in:
Klaus Leithoff 2014-03-21 11:54:38 +00:00
parent 70d2a9f479
commit c0eece6234
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -640,7 +640,7 @@ class addressbook_ui extends addressbook_bo
$this->prefs['document_dir'], $group, 'Insert in document', 'document_', $this->prefs['document_dir'], $group, 'Insert in document', 'document_',
$this->prefs['default_document'], $this->config['contact_export_limit'] $this->prefs['default_document'], $this->config['contact_export_limit']
); );
if (isset($GLOBALS['egw_info']['apps']['stylite']) && $GLOBALS['egw_info']['user']['apps']['felamimail']) if (isset($GLOBALS['egw_info']['apps']['stylite']) && ($GLOBALS['egw_info']['user']['apps']['felamimail']||$GLOBALS['egw_info']['user']['apps']['mail']))
{ {
$actions['mail'] = array( $actions['mail'] = array(
'caption' => lang('Mail VCard'), 'caption' => lang('Mail VCard'),
@ -2503,6 +2503,13 @@ window.egw_LAB.wait(function() {
{ {
if (strpos($email,'@') == false) return ''; if (strpos($email,'@') == false) return '';
if($GLOBALS['egw_info']['user']['apps']['mail'])
{
return array(
'menuaction' => 'mail.mail_compose.compose',
'send_to' => base64_encode($email)
);
}
if($GLOBALS['egw_info']['user']['apps']['felamimail']) if($GLOBALS['egw_info']['user']['apps']['felamimail'])
{ {
return array( return array(

5
addressbook/js/app.js
View File

@ -498,8 +498,9 @@ app.classes.addressbook = AppJS.extend(
*/ */
adb_mail_vcard: function(_action, _elems) adb_mail_vcard: function(_action, _elems)
{ {
var app_registry = egw.link_get_registry('felamimail'); var app_registry = egw.link_get_registry('mail');
var link = egw().link("/index.php","menuaction=felamimail.uicompose.compose"); if (typeof app_registry['view'] == 'undefined') app_registry = egw.link_get_registry('felamimail');
var link = egw().link("/index.php","menuaction="+app_registry['add']['menuaction']);
for (var i = 0; i < _elems.length; i++) for (var i = 0; i < _elems.length; i++)
{ {
link += "&preset[file][]="+encodeURIComponent("vfs://default/apps/addressbook/"+_elems[i].id+"/.entry"); link += "&preset[file][]="+encodeURIComponent("vfs://default/apps/addressbook/"+_elems[i].id+"/.entry");