extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-13 17:38:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

if mail app is available (detect for static function splitRowID), and import_mail is called with param rowid, use application mail for importing (creating infolog/tracker items from emails)

Browse Source
This commit is contained in:
Klaus Leithoff 2013-03-05 14:47:00 +00:00
parent 9c830f7461
commit 176307335e
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2412,6 +2412,21 @@ else
$uid = $_GET['uid']; $uid = $_GET['uid'];
$partid = $_GET['part']; $partid = $_GET['part'];
$mailbox = base64_decode($_GET['mailbox']); $mailbox = base64_decode($_GET['mailbox']);
$mailClass = 'felamimail_bo';
$sessionLocation = 'felamimail';
// if rowid is set, we are called from new mail module.
if (method_exists('mail_ui','splitRowID') && isset($_GET['rowid']) && !empty($_GET['rowid']))
{
// rowid holds all needed information: server, folder, uid, etc.
$rowID = $_GET['rowid'];
$hA = mail_ui::splitRowID($rowID);
$sessionLocation = $hA['app']; // THIS is part of the row ID, we may use this for validation
if ($sessionLocation != 'mail') throw new egw_exception_assertion_failed(lang('Application mail expected but got: %1',$sessionLocation));
$uid = $hA['msgUID'];
$mailbox = $hA['folder'];
$icServerID = $hA['profileID'];
$mailClass = 'mail_bo';
}
if ($_date == false || empty($_date)) $_date = $this->bo->user_time_now; if ($_date == false || empty($_date)) $_date = $this->bo->user_time_now;
if (!empty($_to_emailAddress)) if (!empty($_to_emailAddress))
{ {
@ -2422,16 +2437,16 @@ else
{ {
//echo __METHOD__.'<br>'; //echo __METHOD__.'<br>';
//_debug_array($_attachments); //_debug_array($_attachments);
$icServerID =& egw_cache::getSession('felamimail','activeProfileID'); if (!isset($icServerID)) $icServerID =& egw_cache::getSession($sessionLocation,'activeProfileID');
$bofelamimail = felamimail_bo::getInstance(true,$icServerID); $mailobject = $mailClass::getInstance(true,$icServerID);
$bofelamimail->openConnection(); $mailobject->openConnection();
foreach ($_attachments as $attachment) foreach ($_attachments as $attachment)
{ {
if ($attachment['type'] == 'MESSAGE/RFC822') if ($attachment['type'] == 'MESSAGE/RFC822')
{ {
$bofelamimail->reopen($attachment['folder']); $mailobject->reopen($attachment['folder']);
$mailcontent = felamimail_bo::get_mailcontent($bofelamimail,$attachment['uid'],$attachment['partID'],$attachment['folder']); $mailcontent = $mailClass::get_mailcontent($mailobject,$attachment['uid'],$attachment['partID'],$attachment['folder']);
//_debug_array($mailcontent['attachments']); //_debug_array($mailcontent['attachments']);
foreach($mailcontent['attachments'] as $tmpattach => $tmpval) foreach($mailcontent['attachments'] as $tmpattach => $tmpval)
{ {
@ -2443,8 +2458,8 @@ else
if (!empty($attachment['folder'])) if (!empty($attachment['folder']))
{ {
$is_winmail = $_GET['is_winmail'] ? $_GET['is_winmail'] : 0; $is_winmail = $_GET['is_winmail'] ? $_GET['is_winmail'] : 0;
$bofelamimail->reopen($attachment['folder']); $mailobject->reopen($attachment['folder']);
$attachmentData = $bofelamimail->getAttachment($attachment['uid'],$attachment['partID'],$is_winmail); $attachmentData = $mailobject->getAttachment($attachment['uid'],$attachment['partID'],$is_winmail);
$attachment['file'] =tempnam($GLOBALS['egw_info']['server']['temp_dir'],$GLOBALS['egw_info']['flags']['currentapp']."_"); $attachment['file'] =tempnam($GLOBALS['egw_info']['server']['temp_dir'],$GLOBALS['egw_info']['flags']['currentapp']."_");
$tmpfile = fopen($attachment['file'],'w'); $tmpfile = fopen($attachment['file'],'w');
fwrite($tmpfile,$attachmentData['attachment']); fwrite($tmpfile,$attachmentData['attachment']);
@ -2459,11 +2474,11 @@ else
); );
} }
} }
$bofelamimail->closeConnection(); $mailobject->closeConnection();
} }
// this one adds the mail itself (as message/rfc822 (.eml) file) to the infolog as additional attachment // this one adds the mail itself (as message/rfc822 (.eml) file) to the infolog as additional attachment
// this is done to have a simple archive functionality (ToDo: opening .eml in email module) // this is done to have a simple archive functionality (ToDo: opening .eml in email module)
if ($_rawMailHeader && $_rawMailBody && $GLOBALS['egw_info']['user']['preferences']['felamimail']['saveAsOptions']==='add_raw') if ($_rawMailHeader && $_rawMailBody && $GLOBALS['egw_info']['user']['preferences'][$sessionLocation]['saveAsOptions']==='add_raw')
{ {
$message = ltrim(str_replace("\n","\r\n",$_rawMailHeader)).str_replace("\n","\r\n",$_rawMailBody); $message = ltrim(str_replace("\n","\r\n",$_rawMailHeader)).str_replace("\n","\r\n",$_rawMailBody);
$subject = str_replace('$$','__',($_subject?$_subject:lang('(no subject)'))); $subject = str_replace('$$','__',($_subject?$_subject:lang('(no subject)')));
@ -2484,14 +2499,14 @@ else
$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($attachments); //_debug_array($attachments);
$_body = strip_tags(felamimail_bo::htmlspecialchars($_body)); //we need to fix broken tags (or just stuff like "<800 USD/p" ) $_body = strip_tags($mailClass::htmlspecialchars($_body)); //we need to fix broken tags (or just stuff like "<800 USD/p" )
$_body = htmlspecialchars_decode($_body,ENT_QUOTES); $_body = htmlspecialchars_decode($_body,ENT_QUOTES);
$body = felamimail_bo::createHeaderInfoSection(array('FROM'=>$_to_emailAddress['from'], $body = $mailClass::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),
'CC'=>(!empty($_to_emailAddress['cc'])?implode(',',$_to_emailAddress['cc']):null), 'CC'=>(!empty($_to_emailAddress['cc'])?implode(',',$_to_emailAddress['cc']):null),
'BCC'=>(!empty($_to_emailAddress['bcc'])?implode(',',$_to_emailAddress['bcc']):null), 'BCC'=>(!empty($_to_emailAddress['bcc'])?implode(',',$_to_emailAddress['bcc']):null),
'SUBJECT'=>$_subject, 'SUBJECT'=>$_subject,
'DATE'=>felamimail_bo::_strtotime($_date))).$_body; 'DATE'=>$mailClass::_strtotime($_date))).$_body;
$this->edit($this->bo->import_mail( $this->edit($this->bo->import_mail(
implode(',',$toaddr),$_subject,$body,$attachments,$_date implode(',',$toaddr),$_subject,$body,$attachments,$_date
)); ));
@ -2499,19 +2514,19 @@ else
} }
elseif ($uid && $mailbox) elseif ($uid && $mailbox)
{ {
$icServerID =& egw_cache::getSession('felamimail','activeProfileID'); if (!isset($icServerID)) $icServerID =& egw_cache::getSession($sessionLocation,'activeProfileID');
$bofelamimail = felamimail_bo::getInstance(true,$icServerID); $mailobject = $mailClass::getInstance(true,$icServerID);
$bofelamimail->openConnection(); $mailobject->openConnection();
$bofelamimail->reopen($mailbox); $mailobject->reopen($mailbox);
$mailcontent = felamimail_bo::get_mailcontent($bofelamimail,$uid,$partid,$mailbox); $mailcontent = $mailClass::get_mailcontent($mailobject,$uid,$partid,$mailbox);
// this one adds the mail itself (as message/rfc822 (.eml) file) to the infolog as additional attachment // this one adds the mail itself (as message/rfc822 (.eml) file) to the infolog as additional attachment
// this is done to have a simple archive functionality (ToDo: opening .eml in email module) // this is done to have a simple archive functionality (ToDo: opening .eml in email module)
if ($GLOBALS['egw_info']['user']['preferences']['felamimail']['saveAsOptions']==='add_raw') if ($GLOBALS['egw_info']['user']['preferences'][$sessionLocation]['saveAsOptions']==='add_raw')
{ {
$message = $bofelamimail->getMessageRawBody($uid, $partid); $message = $mailobject->getMessageRawBody($uid, $partid);
$headers = $bofelamimail->getMessageHeader($uid, $partid,true); $headers = $mailobject->getMessageHeader($uid, $partid,true);
$subject = str_replace('$$','__',($headers['SUBJECT']?$headers['SUBJECT']:lang('(no subject)'))); $subject = str_replace('$$','__',($headers['SUBJECT']?$headers['SUBJECT']:lang('(no subject)')));
$attachment_file =tempnam($GLOBALS['egw_info']['server']['temp_dir'],$GLOBALS['egw_info']['flags']['currentapp']."_"); $attachment_file =tempnam($GLOBALS['egw_info']['server']['temp_dir'],$GLOBALS['egw_info']['flags']['currentapp']."_");
$tmpfile = fopen($attachment_file,'w'); $tmpfile = fopen($attachment_file,'w');