extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-17 10:51:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

control the availabilityof the stylite app, before trying to offer the mail VCard feature, because stylite.links:// is used/needed here

Browse Source
This commit is contained in:
Klaus Leithoff 2011-12-16 11:26:01 +00:00
parent cc86326cb4
commit 28c42cc78d
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -585,7 +585,7 @@ class addressbook_ui extends addressbook_bo
$this->prefs['document_dir'], $group, 'Insert in document', 'document_',
$this->prefs['default_document'], $this->config['contact_export_limit']
);
if ($GLOBALS['egw_info']['user']['apps']['felamimail'])
if (isset($GLOBALS['egw_info']['apps']['stylite']) && $GLOBALS['egw_info']['user']['apps']['felamimail'])
{
$actions['mail'] = array(
'caption' => lang('Mail VCard'),

4
felamimail/inc/class.felamimail_hooks.inc.php
View File

@ -248,7 +248,7 @@ class felamimail_hooks
$folderList['none'] = lang('no folders');
/* Settings array for this app */
return array(
$settingsArray = array(
'refreshTime' => array(
'type' => 'select',
'label' => 'Refresh time in minutes',
@ -555,6 +555,8 @@ class felamimail_hooks
'forced' => 'felamimail',
),
);
if (!$GLOBALS['egw_info']['apps']['stylite']) unset($settingsArray['attachVCardAtCompose']);
return $settingsArray;
}
/**

2
felamimail/inc/class.uicompose.inc.php
View File

@ -222,7 +222,7 @@
// all values are empty for a new compose window
$sessionData = $this->bocompose->getSessionData();
$alwaysAttachVCardAtCompose = false; // we use this to eliminate double attachments, if users VCard is already present/attached
if ((isset($this->bocompose->preferencesArray['attachVCardAtCompose']) &&
if ( isset($GLOBALS['egw_info']['apps']['stylite']) && (isset($this->bocompose->preferencesArray['attachVCardAtCompose']) &&
$this->bocompose->preferencesArray['attachVCardAtCompose']))
{
$alwaysAttachVCardAtCompose = true;