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 option to fetch the activeMailProfile by ProfileID

Browse Source
This commit is contained in:
Klaus Leithoff 2011-07-18 13:41:13 +00:00
parent e9eb6154ff
commit 944a31e610
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -692,7 +692,7 @@
{ {
$bofelamimail = $this->bofelamimail; $bofelamimail = $this->bofelamimail;
$_mailObject->PluginDir = EGW_SERVER_ROOT."/phpgwapi/inc/"; $_mailObject->PluginDir = EGW_SERVER_ROOT."/phpgwapi/inc/";
$activeMailProfile = $this->preferences->getIdentity($this->bofelamimail->profileID); $activeMailProfile = $this->preferences->getIdentity($this->bofelamimail->profileID, true);
$_mailObject->IsSMTP(); $_mailObject->IsSMTP();
$_mailObject->CharSet = $this->displayCharset; $_mailObject->CharSet = $this->displayCharset;
// you need to set the sender, if you work with different identities, since most smtp servers, dont allow // you need to set the sender, if you work with different identities, since most smtp servers, dont allow

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

@ -4190,7 +4190,7 @@ class felamimail_bo
//error_log(__METHOD__.__LINE__.' ID:'.$val.' Data:'.array2string($contact)); //error_log(__METHOD__.__LINE__.' ID:'.$val.' Data:'.array2string($contact));
$email = ($contact['email'] ? $contact['email'] : $contact['email_home']); $email = ($contact['email'] ? $contact['email'] : $contact['email_home']);
$nfn = ($contact['n_fn'] ? $contact['n_fn'] : $contact['n_given'].' '.$contact['n_family']); $nfn = ($contact['n_fn'] ? $contact['n_fn'] : $contact['n_given'].' '.$contact['n_family']);
$activeMailProfile = $this->mailPreferences->getIdentity($this->profileID); $activeMailProfile = $this->mailPreferences->getIdentity($this->profileID, true);
//error_log(__METHOD__.__LINE__.array2string($activeMailProfile)); //error_log(__METHOD__.__LINE__.array2string($activeMailProfile));
$mailObject->From = $activeMailProfile->emailAddress; $mailObject->From = $activeMailProfile->emailAddress;
//$mailObject->From = $_identity->emailAddress; //$mailObject->From = $_identity->emailAddress;

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

@ -648,7 +648,7 @@ class felamimail_hooks
break; break;
} }
//error_log(__METHOD__.__LINE__.array2string($preferences->identities)); //error_log(__METHOD__.__LINE__.array2string($preferences->identities));
$activeIdentity =& $preferences->getIdentity($icServerID); $activeIdentity =& $preferences->getIdentity($icServerID, true);
//error_log(__METHOD__.__LINE__.' ActiveIdentity for profileID'.$icServerID.'->'.array2string($activeIdentity)); //error_log(__METHOD__.__LINE__.' ActiveIdentity for profileID'.$icServerID.'->'.array2string($activeIdentity));
if ($imapServer->_connected != 1) $connectionStatus = $bofelamimail->openConnection($icServerID); if ($imapServer->_connected != 1) $connectionStatus = $bofelamimail->openConnection($icServerID);
$folderObjects = $bofelamimail->getFolderObjects(true, false); $folderObjects = $bofelamimail->getFolderObjects(true, false);

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

@ -646,7 +646,7 @@ class uifelamimail
//_debug_array($preferences->preferences); //_debug_array($preferences->preferences);
//error_log(__METHOD__.__LINE__.' ImapServerId:'.$imapServer->ImapServerId.' Prefs:'.array2string($preferences->preferences)); //error_log(__METHOD__.__LINE__.' ImapServerId:'.$imapServer->ImapServerId.' Prefs:'.array2string($preferences->preferences));
//error_log(__METHOD__.__LINE__.' ImapServerObject:'.array2string($imapServer)); //error_log(__METHOD__.__LINE__.' ImapServerObject:'.array2string($imapServer));
if (is_object($preferences)) $activeIdentity =& $preferences->getIdentity(self::$icServerID); if (is_object($preferences)) $activeIdentity =& $preferences->getIdentity(self::$icServerID, true);
//_debug_array($activeIdentity); //_debug_array($activeIdentity);
$maxMessages = 50; $maxMessages = 50;
if (isset($GLOBALS['egw_info']['user']['preferences']['felamimail']['prefMailGridBehavior']) && (int)$GLOBALS['egw_info']['user']['preferences']['felamimail']['prefMailGridBehavior'] <> 0) if (isset($GLOBALS['egw_info']['user']['preferences']['felamimail']['prefMailGridBehavior']) && (int)$GLOBALS['egw_info']['user']['preferences']['felamimail']['prefMailGridBehavior'] <> 0)