From 28c42cc78d5643c30b751c6cd419d3a8685dd619 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 16 Dec 2011 11:26:01 +0000
Subject: [PATCH] control the availabilityof the stylite app, before trying to
 offer the mail VCard feature, because stylite.links:// is used/needed here

---
 addressbook/inc/class.addressbook_ui.inc.php  | 2 +-
 felamimail/inc/class.felamimail_hooks.inc.php | 4 +++-
 felamimail/inc/class.uicompose.inc.php        | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index 714e22a983..282a47f9d3 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -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'),
diff --git a/felamimail/inc/class.felamimail_hooks.inc.php b/felamimail/inc/class.felamimail_hooks.inc.php
index 044f08b8d7..2cd6ad828d 100644
--- a/felamimail/inc/class.felamimail_hooks.inc.php
+++ b/felamimail/inc/class.felamimail_hooks.inc.php
@@ -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;
 	}
 
 	/**
diff --git a/felamimail/inc/class.uicompose.inc.php b/felamimail/inc/class.uicompose.inc.php
index e3dc95f103..1c7d1a9f90 100644
--- a/felamimail/inc/class.uicompose.inc.php
+++ b/felamimail/inc/class.uicompose.inc.php
@@ -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;