diff --git a/Classes/Controller/MailController.php b/Classes/Controller/MailController.php index 1a84815d8c279cd796f245dfe48857701824c828..6402fcda41610725ac897cd3adf0e832b7175fee 100644 --- a/Classes/Controller/MailController.php +++ b/Classes/Controller/MailController.php @@ -155,10 +155,6 @@ class MailController extends ActionController { $colspace = 12; } - $users = BackendService::getFrontendUsers(); - array_unshift($users, NULL); - - $this->view->assign('users', $users); $this->view->assign('colspace', $colspace); $this->view->assign('languageTemplates', $templates); $this->view->assign('languageLabels', BackendService::getLanguageLabels($languages)); diff --git a/Classes/Service/BackendService.php b/Classes/Service/BackendService.php index b6ad4ebcee03b070aa0e2a4f5565262ef533ffd5..36bfe04b336c4e0d9cc18fca783fbfb29de920c6 100644 --- a/Classes/Service/BackendService.php +++ b/Classes/Service/BackendService.php @@ -303,25 +303,6 @@ class BackendService { return $template; } - /** - * get an array of all frontend users - * - * @return array - * @throws \InvalidArgumentException - */ - public static function getFrontendUsers() { - $objectManager = GeneralUtility::makeInstance(ObjectManager::class); - /** @var FrontendUserRepository $frontendUserRepository */ - $frontendUserRepository = $objectManager->get(FrontendUserRepository::class); - - /** @var Typo3QuerySettings $querySettings */ - $querySettings = $objectManager->get(Typo3QuerySettings::class); - $querySettings->setRespectStoragePage(FALSE); - $querySettings->setRespectSysLanguage(FALSE); - $frontendUserRepository->setDefaultQuerySettings($querySettings); - return $frontendUserRepository->findAll()->toArray(); - } - /** * Generate a csv string from the queues, respecting the given filters * diff --git a/Resources/Private/Templates/Mail/Index.html b/Resources/Private/Templates/Mail/Index.html index 5717da400e75d2c9d2c6b254205cb2b5792d36df..53958313236907701c4d7f7d5c1c21ad87237c59 100644 --- a/Resources/Private/Templates/Mail/Index.html +++ b/Resources/Private/Templates/Mail/Index.html @@ -95,10 +95,6 @@ </f:for> <div class="col-md-12"> - <div class="row form-group"> - <label for="parameters[templates][{key}][fromUser]" class="">{f:translate(key:'backend.fromUser')}</label> - <f:form.select class="form-control" property="fromUser" optionValueField="uid" optionLabelField="username" options="{users}" name="parameters[templates][{key}][fromUser]"/> - </div> <div class="row form-group"> <label for="parameters[templates][{key}][fromName]" class="">{f:translate(key:'backend.fromName')}</label> <f:form.textfield type="text" class="form-control" value="{languageTemplate.fromName}" name="parameters[templates][{key}][fromName]" />