mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-26 04:41:41 +02:00
fix typo, remove unneeded instance of mailPreferences
This commit is contained in:
parent
fbdbfda46a
commit
0f5e8d53bf
@ -1496,8 +1496,8 @@ class infolog_ui
|
|||||||
//echo __METHOD__.'<br>';
|
//echo __METHOD__.'<br>';
|
||||||
//_debug_array($_attachments);
|
//_debug_array($_attachments);
|
||||||
$bofelamimail = CreateObject('felamimail.bofelamimail',$GLOBALS['egw']->translation->charset());
|
$bofelamimail = CreateObject('felamimail.bofelamimail',$GLOBALS['egw']->translation->charset());
|
||||||
$bopreferences =& $this->bofelamimail->bopreferences; //= CreateObject('felamimail.bopreferences');
|
//$bopreferences =& $bofelamimail->bopreferences; //= CreateObject('felamimail.bopreferences');
|
||||||
$preferences = $this->bopreferences->getPreferences();
|
//$preferences =& $bofelamimail->mailPreferences;
|
||||||
$bofelamimail->openConnection();
|
$bofelamimail->openConnection();
|
||||||
foreach ($_attachments as $attachment)
|
foreach ($_attachments as $attachment)
|
||||||
{
|
{
|
||||||
@ -1538,7 +1538,6 @@ class infolog_ui
|
|||||||
//_debug_array($_to_emailAddress);
|
//_debug_array($_to_emailAddress);
|
||||||
$toaddr = array();
|
$toaddr = array();
|
||||||
foreach(array('to','cc','bcc') as $x) if (is_array($_to_emailAddress[$x]) && !empty($_to_emailAddress[$x])) $toaddr = array_merge($toaddr,$_to_emailAddress[$x]);
|
foreach(array('to','cc','bcc') as $x) if (is_array($_to_emailAddress[$x]) && !empty($_to_emailAddress[$x])) $toaddr = array_merge($toaddr,$_to_emailAddress[$x]);
|
||||||
//_debug_array($preferences);
|
|
||||||
//_debug_array($attachments);
|
//_debug_array($attachments);
|
||||||
$body = self::createHeaderInfoSection(array('FROM'=>$_to_emailAddress['from'],
|
$body = self::createHeaderInfoSection(array('FROM'=>$_to_emailAddress['from'],
|
||||||
'TO'=>(!empty($_to_emailAddress['to'])?implode(',',$_to_emailAddress['to']):null),
|
'TO'=>(!empty($_to_emailAddress['to'])?implode(',',$_to_emailAddress['to']):null),
|
||||||
@ -1554,7 +1553,7 @@ class infolog_ui
|
|||||||
elseif ($uid && $mailbox)
|
elseif ($uid && $mailbox)
|
||||||
{
|
{
|
||||||
$bofelamimail = CreateObject('felamimail.bofelamimail',$GLOBALS['egw']->translation->charset());
|
$bofelamimail = CreateObject('felamimail.bofelamimail',$GLOBALS['egw']->translation->charset());
|
||||||
$bopreferences =& $this->bofelamimail->bopreferences; //= CreateObject('felamimail.bopreferences');
|
//$bopreferences =& $bofelamimail->bopreferences; //= CreateObject('felamimail.bopreferences');
|
||||||
$bofelamimail->openConnection();
|
$bofelamimail->openConnection();
|
||||||
$bofelamimail->reopen($mailbox);
|
$bofelamimail->reopen($mailbox);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user