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

reenabling the observance of the preference setting for forward as attachments; add notice to body that forwarded messagebody is found in attachments; add folder info in getAttachment calls when available

Browse Source
This commit is contained in:
Klaus Leithoff 2015-05-12 09:07:06 +00:00
parent 37bc839ea7
commit a9c66335e7
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mail/inc/class.mail_activesync.inc.php
View File

@ -676,8 +676,6 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
// receive entire mail (header + body) // receive entire mail (header + body)
// get message headers for specified message // get message headers for specified message
$headers = $this->mail->getMessageEnvelope($uid, $_partID, true, $folder); $headers = $this->mail->getMessageEnvelope($uid, $_partID, true, $folder);
// do forwarding as inline, until we understand why asmail fails
$preferencesArray['message_forwarding']='inline';
// build a new mime message, forward entire old mail as file // build a new mime message, forward entire old mail as file
if ($preferencesArray['message_forwarding'] == 'asmail') if ($preferencesArray['message_forwarding'] == 'asmail')
{ {
@ -685,6 +683,9 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
$rawHeader = $this->mail->getMessageRawHeader($smartdata['itemid'], $_partID,$folder); $rawHeader = $this->mail->getMessageRawHeader($smartdata['itemid'], $_partID,$folder);
$rawBody = $this->mail->getMessageRawBody($smartdata['itemid'], $_partID,$folder); $rawBody = $this->mail->getMessageRawBody($smartdata['itemid'], $_partID,$folder);
$mailObject->AddStringAttachment($rawHeader.$rawBody, $headers['SUBJECT'].'.eml', 'message/rfc822'); $mailObject->AddStringAttachment($rawHeader.$rawBody, $headers['SUBJECT'].'.eml', 'message/rfc822');
$AltBody = $AltBody."</br>".lang("See Attachments for Content of the Orignial Mail").$sigTextHtml;
$Body = $Body."\r\n".lang("See Attachments for Content of the Orignial Mail").$sigTextPlain;
$isforward = true;
} }
else else
{ {
@ -1092,7 +1093,7 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
break; break;
default: default:
$attachmentData = ''; $attachmentData = '';
$attachmentData = $this->mail->getAttachment($id, $attachment['partID'],0,false); $attachmentData = $this->mail->getAttachment($id, $attachment['partID'],0,false,false,$_folderName);
$mailObject->AddStringAttachment($attachmentData['attachment'], $mailObject->EncodeHeader($attachment['name']), 'base64', $attachment['mimeType']); $mailObject->AddStringAttachment($attachmentData['attachment'], $mailObject->EncodeHeader($attachment['name']), 'base64', $attachment['mimeType']);
break; break;
} }
@ -1215,7 +1216,7 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
// pass meeting requests to calendar plugin // pass meeting requests to calendar plugin
if (strtolower($attach['mimeType']) == 'text/calendar' && strtolower($attach['method']) == 'request' && if (strtolower($attach['mimeType']) == 'text/calendar' && strtolower($attach['method']) == 'request' &&
isset($GLOBALS['egw_info']['user']['apps']['calendar']) && isset($GLOBALS['egw_info']['user']['apps']['calendar']) &&
($attachment = $this->mail->getAttachment($id, $attach['partID'],0,false)) && ($attachment = $this->mail->getAttachment($id, $attach['partID'],0,false,false,$_folderName)) &&
($output->meetingrequest = calendar_activesync::meetingRequest($attachment['attachment']))) ($output->meetingrequest = calendar_activesync::meetingRequest($attachment['attachment'])))
{ {
$output->messageclass = "IPM.Schedule.Meeting.Request"; $output->messageclass = "IPM.Schedule.Meeting.Request";
@ -1316,7 +1317,7 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
*/ */
function GetAttachmentData($fid,$attname) { function GetAttachmentData($fid,$attname) {
debugLog("getAttachmentData: $fid (attname: '$attname')"); debugLog("getAttachmentData: $fid (attname: '$attname')");
//error_log(__METHOD__.__LINE__." Fid: $fid (attname: '$attname')"); error_log(__METHOD__.__LINE__." Fid: $fid (attname: '$attname')");
list($folderid, $id, $part) = explode(":", $attname); list($folderid, $id, $part) = explode(":", $attname);
$this->splitID($folderid, $account, $folder); $this->splitID($folderid, $account, $folder);
@ -1324,7 +1325,7 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true); if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
$this->mail->reopen($folder); $this->mail->reopen($folder);
$attachment = $this->mail->getAttachment($id,$part,0,false); $attachment = $this->mail->getAttachment($id,$part,0,false,false,$folder);
print $attachment['attachment']; print $attachment['attachment'];
unset($attachment); unset($attachment);
return true; return true;
@ -1350,7 +1351,7 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false, self::$profileID,true,false,true); if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false, self::$profileID,true,false,true);
$this->mail->reopen($folder); $this->mail->reopen($folder);
$att = $this->mail->getAttachment($id,$part,0,false); $att = $this->mail->getAttachment($id,$part,0,false,false,$folder);
$attachment = new SyncAirSyncBaseFileAttachment(); $attachment = new SyncAirSyncBaseFileAttachment();
/* /*
debugLog(__METHOD__.__LINE__.array2string($att)); debugLog(__METHOD__.__LINE__.array2string($att));

1
mail/lang/egw_de.lang
View File

@ -372,6 +372,7 @@ save: mail de Speichern
saving of message %1 failed. destination folder %2 does not exist. mail de Speichern der Nachricht %1 ist fehlgeschlagen. Ziel Ordner %2 existiert nicht. saving of message %1 failed. destination folder %2 does not exist. mail de Speichern der Nachricht %1 ist fehlgeschlagen. Ziel Ordner %2 existiert nicht.
saving of message %1 succeeded. check folder %2. mail de Speichern der Nachricht %1 war erfolgreich. Prüfen Sie den Ziel Ordner %2 saving of message %1 succeeded. check folder %2. mail de Speichern der Nachricht %1 war erfolgreich. Prüfen Sie den Ziel Ordner %2
saving the rule failed: mail de Speichern der Regel ist fehlgeschlagen: saving the rule failed: mail de Speichern der Regel ist fehlgeschlagen:
see attachments for content of the orignial mail mail de Die Original Nachricht wurde als Anhang an diese e-Mail angehängt
select all mail de Alle Auswählen select all mail de Alle Auswählen
select an existing entry in order to append mail content to it mail de Bestehendes Ticket auswählen, zu dem die Mail als Kommentar hinzugefügt werden soll. select an existing entry in order to append mail content to it mail de Bestehendes Ticket auswählen, zu dem die Mail als Kommentar hinzugefügt werden soll.
select file to attach to message mail de Wählen Sie die Dateien aus, die Sie an diese Nachricht anhängen möchten. select file to attach to message mail de Wählen Sie die Dateien aus, die Sie an diese Nachricht anhängen möchten.

1
mail/lang/egw_en.lang
View File

@ -372,6 +372,7 @@ save: mail en Save:
saving of message %1 failed. destination folder %2 does not exist. mail en Saving of message %1 failed. Destination Folder %2 does not exist. saving of message %1 failed. destination folder %2 does not exist. mail en Saving of message %1 failed. Destination Folder %2 does not exist.
saving of message %1 succeeded. check folder %2. mail en Saving of message %1 succeeded. Check Folder %2. saving of message %1 succeeded. check folder %2. mail en Saving of message %1 succeeded. Check Folder %2.
saving the rule failed: mail en Saving the rule failed: saving the rule failed: mail en Saving the rule failed:
see attachments for content of the orignial mail mail en See Attachments for Content of the Orignial Mail
select all mail en Select all select all mail en Select all
select an existing entry in order to append mail content to it mail en Select an existing entry in order to append mail content to it select an existing entry in order to append mail content to it mail en Select an existing entry in order to append mail content to it
select file to attach to message mail en Select file to attach to message select file to attach to message mail en Select file to attach to message