Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions Classes/Controller/UserimportController.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use Psr\Http\Message\ResponseInterface;
use TYPO3\CMS\Backend\Template\ModuleTemplateFactory;
use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
use TYPO3\CMS\Core\Type\ContextualFeedbackSeverity;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Domain\Model\FileReference;
use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
Expand Down Expand Up @@ -169,6 +170,25 @@ public function importPreviewAction(ImportJob $importJob, array $fieldMapping):
$previewData = $this->spreadsheetService->generateDataFromImportJob($importJob, true);
$this->view->assign('previewDataHeader', array_keys($previewData[0]));
$this->view->assign('previewData', $previewData);

// Validate email addresses in mapped data
$invalidEmails = [];
$useEmailAsUsername = (bool) $importJob->getImportOption(ImportJob::IMPORT_OPTION_USE_EMAIL_AS_USERNAME);
foreach ($previewData as $row) {
if (isset($row['email']) && !filter_var($row['email'], FILTER_VALIDATE_EMAIL)) {
$invalidEmails[] = $row['email'];
} elseif ($useEmailAsUsername && isset($row['username']) && !filter_var($row['username'], FILTER_VALIDATE_EMAIL)) {
$invalidEmails[] = $row['username'];
}
}
if (!empty($invalidEmails)) {
$this->addFlashMessage(
'The following email addresses are invalid and will be skipped during import: '
. implode(', ', $invalidEmails),
'Invalid email addresses detected',
ContextualFeedbackSeverity::WARNING
);
}
return $this->view->renderResponse('Userimport/ImportPreview');
}

Expand Down
9 changes: 9 additions & 0 deletions Classes/Service/UserImportService.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,15 @@ public function performImport(ImportJob $importJob, array $rowsToImport = [])
foreach ($rowsToImport as $row) {
$rowForLog = LogUtility::formatRowForImportLog($row);

// Validate email format if email field is present
if (isset($row['email']) && !filter_var($row['email'], FILTER_VALIDATE_EMAIL)) {
$log[] = [
'action' => 'skip.invalidEmail',
'row' => $rowForLog,
];
continue;
}

if ($updateExisting) {
$targetFolder = (int) $importJob->getImportOption(ImportJob::IMPORT_OPTION_TARGET_FOLDER);
$updateExistingUniqueField = $importJob->getImportOption(ImportJob::IMPORT_OPTION_UPDATE_EXISTING_USERS_UNIQUE_FIELD);
Expand Down