Skip to content
Snippets Groups Projects
Verified Commit 09f35f88 authored by Florian Azizian's avatar Florian Azizian
Browse files

FIX #9692 test M2M

parent d255c89c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
modules/export_seda/Controllers/AdapterEmail.php
+ 9
− 2
View file @ 09f35f88
......@@ -20,11 +20,18 @@ class AdapterEmail
if ($gec == 'maarch_courrier') {
$document = ['id' => $messageObject->DataObjectPackage->DescriptiveMetadata->ArchiveUnit[0]->Content->OriginatingSystemId, 'isLinked' => false, 'original' => false];
$userInfo = \User\models\UserModel::getByLogin(['login' => $messageObject->TransferringAgency->OrganizationDescriptiveMetadata->UserIdentifier, 'select' => ['id']]);
$userInfo = \User\models\UserModel::getByLogin(['login' => $messageObject->TransferringAgency->OrganizationDescriptiveMetadata->UserIdentifier, 'select' => ['id', 'mail']]);
if (!empty($messageObject->TransferringAgency->OrganizationDescriptiveMetadata->Contact[0]->Communication[1]->value)) {
$senderEmail = $messageObject->TransferringAgency->OrganizationDescriptiveMetadata->Contact[0]->Communication[1]->value;
} else {
$senderEmail = $userInfo['mail'];
}
\Email\controllers\EmailController::createEmail([
'userId' => $userInfo['id'],
'data' => [
'sender' => ['email' => $messageObject->TransferringAgency->OrganizationDescriptiveMetadata->Contact[0]->Communication[1]->value],
'sender' => ['email' => $senderEmail],
'recipients' => [$messageObject->ArchivalAgency->OrganizationDescriptiveMetadata->Communication[0]->value],
'cc' => '',
'cci' => '',
......
modules/sendmail/class/class_modules_tools_Abstract.php
+ 0
− 17
View file @ 09f35f88
......@@ -210,23 +210,6 @@ abstract class SendmailAbstract extends Database
return $text;
}
public function cleanHtml($htmlContent)
{
$htmlContent = str_replace(';', '###', $htmlContent);
$htmlContent = str_replace('--', '___', $htmlContent);
$allowedTags = '<html><head><body><title>'; //Structure
$allowedTags .= '<h1><h2><h3><h4><h5><h6><b><i><tt><u><strike><blockquote><pre><blink><font><big><small><sup><sub><strong><em>'; // Text formatting
$allowedTags .='<p><br><hr><center><div><span>'; // Text position
$allowedTags .= '<li><ol><ul><dl><dt><dd>'; // Lists
$allowedTags .= '<img><a>'; // Multimedia
$allowedTags .= '<table><tr><td><th><tbody><thead><tfooter><caption>'; // Tables
$allowedTags .= '<form><input><textarea><select>'; // Forms
$htmlContent = strip_tags($htmlContent, $allowedTags);
return $htmlContent;
}
public function updateAdressInputField($ajaxPath, $adressArray, $inputField, $readOnly = false)
{
$content = '';
......
src/app/external/exportSeda/controllers/AdapterEmailController.php
+ 9
− 2
View file @ 09f35f88
......@@ -31,11 +31,18 @@ class AdapterEmailController
if ($gec == 'maarch_courrier') {
$document = ['id' => $messageObject->DataObjectPackage->DescriptiveMetadata->ArchiveUnit[0]->Content->OriginatingSystemId, 'isLinked' => false, 'original' => false];
$userInfo = UserModel::getByLogin(['login' => $messageObject->TransferringAgency->OrganizationDescriptiveMetadata->UserIdentifier, 'select' => ['id']]);
$userInfo = UserModel::getByLogin(['login' => $messageObject->TransferringAgency->OrganizationDescriptiveMetadata->UserIdentifier, 'select' => ['id', 'mail']]);
if (!empty($messageObject->TransferringAgency->OrganizationDescriptiveMetadata->Contact[0]->Communication[1]->value)) {
$senderEmail = $messageObject->TransferringAgency->OrganizationDescriptiveMetadata->Contact[0]->Communication[1]->value;
} else {
$senderEmail = $userInfo['mail'];
}
EmailController::createEmail([
'userId' => $userInfo['id'],
'data' => [
'sender' => ['email' => $messageObject->TransferringAgency->OrganizationDescriptiveMetadata->Contact[0]->Communication[1]->value],
'sender' => ['email' => $senderEmail],
'recipients' => [$messageObject->ArchivalAgency->OrganizationDescriptiveMetadata->Communication[0]->value],
'cc' => '',
'cci' => '',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment