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

move bo_merge as Storage\Merge into api

Browse Source
This commit is contained in:
Ralf Becker 2016-04-05 18:43:46 +00:00
parent 41d00a0fd1
commit 36b9eb4cfb
3 changed files with 2060 additions and 2019 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/src/Mail.php
View File

@ -6530,22 +6530,22 @@ class Mail
/**
* importMessageToMergeAndSend
*
* @param object &bo_merge bo_merge object
* @param Storage\Merge bo_merge bo_merge object
* @param string $document the full filename
* @param array $SendAndMergeTocontacts array of contact ids
* @param string $_folder (passed by reference) will set the folder used. must be set with a folder, but will hold modifications if
* @param string& $_folder (passed by reference) will set the folder used. must be set with a folder, but will hold modifications if
* folder is modified
* @param string $importID ID for the imported message, used by attachments to identify them unambiguously
* @param string& $importID ID for the imported message, used by attachments to identify them unambiguously
* @return mixed array of messages with success and failed messages or exception
*/
function importMessageToMergeAndSend(bo_merge $bo_merge, $document, $SendAndMergeTocontacts, &$_folder, &$importID='')
function importMessageToMergeAndSend(Storage\Merge $bo_merge, $document, $SendAndMergeTocontacts, &$_folder, &$importID='')
{
$importfailed = false;
$processStats = array('success'=>array(),'failed'=>array());
if (empty($SendAndMergeTocontacts))
{
$importfailed = true;
$alert_msg .= lang("Import of message %1 failed. No Contacts to merge and send to specified.",$_formData['name']);
$alert_msg .= lang("Import of message %1 failed. No Contacts to merge and send to specified.", '');
}
// check if formdata meets basic restrictions (in tmp dir, or vfs, mimetype, etc.)
@ -6636,7 +6636,7 @@ class Mail
$nfn = ($contact['n_fn'] ? $contact['n_fn'] : $contact['n_given'].' '.$contact['n_family']);
if($email)
{
$mailObject->addAddress(Horde_Idna::encode($email),$mailObject->EncodeHeader($nfn));
$mailObject->addAddress(Horde_Idna::encode($email), $nfn);
}
}
@ -6692,7 +6692,7 @@ class Mail
$nfn = ($contact['n_fn'] ? $contact['n_fn'] : $contact['n_given'].' '.$contact['n_family']);
if($email)
{
$mailObject->addAddress(Horde_Idna::encode($email),$mailObject->EncodeHeader($nfn));
$mailObject->addAddress(Horde_Idna::encode($email), $nfn);
}
}
$mailObject->addHeader('Subject', $bo_merge->merge_string($Subject, $val, $e, 'text/plain', array(), self::$displayCharset));

2046
api/src/Storage/Merge.php Normal file
View File

File diff suppressed because it is too large Load Diff

2019
etemplate/inc/class.bo_merge.inc.php
View File

File diff suppressed because it is too large Load Diff