diff --git a/modules/export_seda/Controllers/AdapterEmail.php b/modules/export_seda/Controllers/AdapterEmail.php
index bd6d649b8522cfee596d0385e6772310a84748ba..24482f1be543bdd188e7e4ad88913411fe41794d 100755
--- a/modules/export_seda/Controllers/AdapterEmail.php
+++ b/modules/export_seda/Controllers/AdapterEmail.php
@@ -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' => '',
diff --git a/modules/sendmail/class/class_modules_tools_Abstract.php b/modules/sendmail/class/class_modules_tools_Abstract.php
index a56bd42ffb0603079610c8d0935236d3b4166ac6..ebea4eae424060719c7ffbd59b4d3fd550d9f5e9 100755
--- a/modules/sendmail/class/class_modules_tools_Abstract.php
+++ b/modules/sendmail/class/class_modules_tools_Abstract.php
@@ -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 = '';
diff --git a/src/app/external/exportSeda/controllers/AdapterEmailController.php b/src/app/external/exportSeda/controllers/AdapterEmailController.php
index b1c10fac8dc68edc240d367d6b546bedea050940..7c6c0090895f629424da5df30501ff08602b256b 100755
--- a/src/app/external/exportSeda/controllers/AdapterEmailController.php
+++ b/src/app/external/exportSeda/controllers/AdapterEmailController.php
@@ -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' => '',