extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-23 05:41:02 +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:40:58 +00:00
parent fdc6f1f63f
commit e9eb6154ff
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
felamimail/inc/class.felamimail_activesync.inc.php
View File

@ -147,7 +147,14 @@ class felamimail_activesync implements activesync_plugin_write, activesync_plugi
{ {
if (!$this->mail) $this->mail = felamimail_bo::getInstance(true,(self::$profileID=='G'?0:self::$profileID)); if (!$this->mail) $this->mail = felamimail_bo::getInstance(true,(self::$profileID=='G'?0:self::$profileID));
$selectedID = $this->mail->getIdentitiesWithAccounts($identities); $selectedID = $this->mail->getIdentitiesWithAccounts($identities);
$activeIdentity =& $this->mail->mailPreferences->getIdentity((self::$profileID=='G'?0:self::$profileID)); if (self::$profileID=='G')
{
$activeIdentity =& $this->mail->mailPreferences->getIdentity(0);
}
else
{
$activeIdentity =& $this->mail->mailPreferences->getIdentity(self::$profileID, true);
}
// if you use user defined accounts you may want to access the profile defined with the emailadmin available to the user // if you use user defined accounts you may want to access the profile defined with the emailadmin available to the user
if ($activeIdentity->id || self::$profileID == 'G') { if ($activeIdentity->id || self::$profileID == 'G') {
$boemailadmin = new emailadmin_bo(); $boemailadmin = new emailadmin_bo();
@ -309,7 +316,7 @@ class felamimail_activesync implements activesync_plugin_write, activesync_plugi
} }
// initialize our felamimail_bo // initialize our felamimail_bo
if (!isset($this->mail)) $this->mail = felamimail_bo::getInstance(false,self::$profileID); if (!isset($this->mail)) $this->mail = felamimail_bo::getInstance(false,self::$profileID);
$activeMailProfile = $this->mail->mailPreferences->getIdentity(self::$profileID); $activeMailProfile = $this->mail->mailPreferences->getIdentity(self::$profileID, true);
if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' ProfileID:'.self::$profileID.' ActiveMailProfile:'.array2string($activeMailProfile)); if ($this->debugLevel>2) debugLog(__METHOD__.__LINE__.' ProfileID:'.self::$profileID.' ActiveMailProfile:'.array2string($activeMailProfile));
// initialize the new egw_mailer object for sending // initialize the new egw_mailer object for sending