extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-27 16:29:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

bofelamimail --> felamimail_bo

Browse Source
This commit is contained in:
Ralf Becker 2011-03-10 12:51:45 +00:00
parent c7122b1006
commit c8bf14e1fc
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
infolog/inc/class.infolog_ui.inc.php
View File

@ -1821,9 +1821,7 @@ class infolog_ui
{
//echo __METHOD__.'<br>';
//_debug_array($_attachments);
$bofelamimail = CreateObject('felamimail.bofelamimail',$GLOBALS['egw']->translation->charset());
//$bopreferences =& $bofelamimail->bopreferences; //= CreateObject('felamimail.bopreferences');
//$preferences =& $bofelamimail->mailPreferences;
$bofelamimail = felamimail_bo::getInstance();
$bofelamimail->openConnection();
foreach ($_attachments as $attachment)
{
@ -1831,7 +1829,7 @@ class infolog_ui
{
$bofelamimail->reopen($attachment['folder']);
$mailcontent = bofelamimail::get_mailcontent($bofelamimail,$attachment['uid'],$attachment['partID'],$attachment['folder']);
$mailcontent = felamimail_bo::get_mailcontent($bofelamimail,$attachment['uid'],$attachment['partID'],$attachment['folder']);
//_debug_array($mailcontent['attachments']);
foreach($mailcontent['attachments'] as $tmpattach => $tmpval)
{
@ -1865,14 +1863,14 @@ class infolog_ui
$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]);
//_debug_array($attachments);
$_body = strip_tags(bofelamimail::htmlspecialchars($_body)); //we need to fix broken tags (or just stuff like "<800 USD/p" )
$_body = strip_tags(felamimail_bo::htmlspecialchars($_body)); //we need to fix broken tags (or just stuff like "<800 USD/p" )
$_body = htmlspecialchars_decode($_body,ENT_QUOTES);
$body = bofelamimail::createHeaderInfoSection(array('FROM'=>$_to_emailAddress['from'],
$body = felamimail_bo::createHeaderInfoSection(array('FROM'=>$_to_emailAddress['from'],
'TO'=>(!empty($_to_emailAddress['to'])?implode(',',$_to_emailAddress['to']):null),
'CC'=>(!empty($_to_emailAddress['cc'])?implode(',',$_to_emailAddress['cc']):null),
'BCC'=>(!empty($_to_emailAddress['bcc'])?implode(',',$_to_emailAddress['bcc']):null),
'SUBJECT'=>$_subject,
'DATE'=>bofelamimail::_strtotime($_date))).$_body;
'DATE'=>felamimail_bo::_strtotime($_date))).$_body;
$this->edit($this->bo->import_mail(
implode(',',$toaddr),$_subject,$body,$attachments,$_date
));
@ -1880,12 +1878,11 @@ class infolog_ui
}
elseif ($uid && $mailbox)
{
$bofelamimail = CreateObject('felamimail.bofelamimail',$GLOBALS['egw']->translation->charset());
//$bopreferences =& $bofelamimail->bopreferences; //= CreateObject('felamimail.bopreferences');
$bofelamimail = felamimail_bo::getInstance();
$bofelamimail->openConnection();
$bofelamimail->reopen($mailbox);
$mailcontent = bofelamimail::get_mailcontent($bofelamimail,$uid,$partid,$mailbox);
$mailcontent = felamimail_bo::get_mailcontent($bofelamimail,$uid,$partid,$mailbox);
return $this->edit($this->bo->import_mail(
$mailcontent['mailaddress'],