holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

need to use initialised smtp object from mail account

Browse Source
This commit is contained in:
Ralf Becker 2014-05-20 17:15:37 +00:00
parent c707a25b5a
commit 467c715ddc
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mail/inc/class.mail_sieve.inc.php
View File

@ -58,13 +58,6 @@ class mail_sieve
*/ */
var $currentIdentity; var $currentIdentity;
/**
* emailamdin_smpt object
*
* @var object
*/
var $smtp;
/** /**
* user has admin right to emailadmin * user has admin right to emailadmin
* *
@ -97,7 +90,6 @@ class mail_sieve
$this->displayCharset = translation::charset(); $this->displayCharset = translation::charset();
$profileID = 0; $profileID = 0;
$this->mail_admin = isset($GLOBALS['egw_info']['user']['apps']['emailadmin']); $this->mail_admin = isset($GLOBALS['egw_info']['user']['apps']['emailadmin']);
$this->smtp = new emailadmin_smtp();
if (isset($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'])) if (isset($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID']))
{ {
@ -477,7 +469,7 @@ class mail_sieve
} }
if (is_null($accountID)) $accountID = $GLOBALS['egw_info']['user']['account_id']; if (is_null($accountID)) $accountID = $GLOBALS['egw_info']['user']['account_id'];
$accAllIdentities = $this->smtp->getAccountEmailAddress(accounts::id2name($accountID)); $accAllIdentities = $this->account->smtpServer()->getAccountEmailAddress(accounts::id2name($accountID));
$allAliases = array($this->account->acc_imap_username); $allAliases = array($this->account->acc_imap_username);
foreach ($accAllIdentities as &$arrVal) foreach ($accAllIdentities as &$arrVal)
{ {