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

use new functionality (forceEAProfileLoad) in hooks and uiaccounts

Browse Source
This commit is contained in:
Klaus Leithoff 2012-11-19 13:58:34 +00:00
parent 7a2583562f
commit 7cc8b4e4ea
2 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/inc/class.uiaccounts.inc.php
View File

@ -1209,10 +1209,9 @@
if ($group_repository['mailAllowed'] && $GLOBALS['egw_info']['apps']['emailadmin'] &&
$GLOBALS['egw_info']['apps']['felamimail'])
{
$emailadmin = new emailadmin_bo();
if (($default_profile_id = $emailadmin->getDefaultProfileID()))
if (($default_profile_id = emailadmin_bo::getDefaultProfileID()))
{
$bofelamimail = felamimail_bo::getInstance(true, $default_profile_id);
$bofelamimail = felamimail_bo::forceEAProfileLoad($default_profile_id);
$ogServer = $bofelamimail->mailPreferences->getOutgoingServer($default_profile_id);
//error_log(__METHOD__."() default_profile_id = $default_profile_id, get_class(ogServer)=".get_class($ogServer));
if (!in_array(get_class($ogServer), array('defaultsmtp', 'emailadmin_smtp')))

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

@ -20,10 +20,9 @@ class felamimail_hooks
*/
static public function accountHooks($hookData)
{
$emailadmin = new emailadmin_bo();
if (($default_profile_id = $emailadmin->getDefaultProfileID()))
if (($default_profile_id = emailadmin_bo::getDefaultProfileID()))
{
$bofelamimail = felamimail_bo::getInstance(true, $default_profile_id);
$bofelamimail = felamimail_bo::forceEAProfileLoad($default_profile_id);
switch(is_array($hookData) ? $hookData['location'] : $hookData)
{
@ -45,10 +44,9 @@ class felamimail_hooks
*/
static public function adminMenu()
{
$emailadmin = new emailadmin_bo();
if (($default_profile_id = $emailadmin->getDefaultProfileID()))
if (($default_profile_id = emailadmin_bo::getDefaultProfileID()))
{
$bofelamimail = felamimail_bo::getInstance(true, $default_profile_id);
$bofelamimail = felamimail_bo::forceEAProfileLoad($default_profile_id);
$ogServer = $bofelamimail->mailPreferences->getOutgoingServer($default_profile_id);
//error_log(__METHOD__."() default_profile_id = $default_profile_id, get_class(ogServer)=".get_class($ogServer));
@ -76,22 +74,29 @@ class felamimail_hooks
static function search_link($location)
{
return array(
'view' => array(
'menuaction' => 'felamimail.uidisplay.display',
),
'view_popup' => '850xegw_getWindowOuterHeight()',
'add' => array(
'menuaction' => 'felamimail.uicompose.compose',
),
'add_popup' => '850xegw_getWindowOuterHeight()',
// register fmail as handler for .eml files
'mime' => array(
'message/rfc822' => array(
'menuaction' => 'felamimail.uifelamimail.importMessageFromVFS2DraftAndDisplay',
'mime_popup' => '850xegw_getWindowOuterHeight()',
'mime_url' => 'formData[file]',
),
),
'view' => array(
'menuaction' => 'felamimail.uidisplay.display',
),
'view_popup' => '850xegw_getWindowOuterHeight()',
'add' => array(
'menuaction' => 'felamimail.uicompose.compose',
),
'add_popup' => '850xegw_getWindowOuterHeight()',
// register fmail as handler for .eml files
'mime' => array(
'message/rfc822' => array(
// 'view' => array(
'menuaction' => 'felamimail.uifelamimail.importMessageFromVFS2DraftAndDisplay',
'mime_popup' => '850xegw_getWindowOuterHeight()',
'mime_url' => 'formData[file]',
/* ),
'edit' => array(
'menuaction' => 'felamimail.uifelamimail.importMessageFromVFS2DraftAndEdit',
'mime_popup' => '850xegw_getWindowOuterHeight()',
'mime_url' => 'formData[file]',
),
*/ ),
),
);
}