diff --git a/public/typo3conf/ext/ep_products/Classes/Controller/AjaxSearchController.php b/public/typo3conf/ext/ep_products/Classes/Controller/AjaxSearchController.php index 676dcc70..6db3b79c 100644 --- a/public/typo3conf/ext/ep_products/Classes/Controller/AjaxSearchController.php +++ b/public/typo3conf/ext/ep_products/Classes/Controller/AjaxSearchController.php @@ -109,7 +109,7 @@ class AjaxSearchController extends ActionController $referringPageUri = $this ->uriBuilder ->reset() - ->setTargetPageUid($this->settings['defaultSearchPageUid']) + ->setTargetPageUid((int)$this->settings['defaultSearchPageUid']) ->uriFor( 'searchresult', ['filterSettings' => $filterSettings], diff --git a/public/typo3conf/ext/ep_products/Classes/Service/DateService.php b/public/typo3conf/ext/ep_products/Classes/Service/DateService.php index 4e87d041..0352621d 100644 --- a/public/typo3conf/ext/ep_products/Classes/Service/DateService.php +++ b/public/typo3conf/ext/ep_products/Classes/Service/DateService.php @@ -358,7 +358,7 @@ class DateService implements SingletonInterface $hotelUid = $row['hotelUid']; $hotelUri = $this->uriBuilder ->reset() - ->setTargetPageUid($row['hotelDetailPageUid']) + ->setTargetPageUid((int)$row['hotelDetailPageUid']) ->buildFrontendUri(); if (!array_key_exists($hotelUid, $priceTable[$categoryUid])) { diff --git a/public/typo3conf/ext/ep_products/Classes/Service/EmailService.php b/public/typo3conf/ext/ep_products/Classes/Service/EmailService.php index c05afe99..94bfda06 100644 --- a/public/typo3conf/ext/ep_products/Classes/Service/EmailService.php +++ b/public/typo3conf/ext/ep_products/Classes/Service/EmailService.php @@ -26,34 +26,25 @@ namespace EP\EpProducts\Service; * This copyright notice MUST APPEAR in all copies of the script! ***************************************************************/ +use Symfony\Component\Mime\Address; use Symfony\Component\OptionsResolver\OptionsResolver; -use TYPO3\CMS\Core\Mail\MailMessage; +use TYPO3\CMS\Core\Mail\FluidEmail; +use TYPO3\CMS\Core\Mail\Mailer; use TYPO3\CMS\Core\SingletonInterface; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface; -use TYPO3\CMS\Fluid\View\StandaloneView; class EmailService implements SingletonInterface { - - /** - * @var ConfigurationManagerInterface - */ - protected $configurationManager; - /** * @var array */ protected $settings; - /** - * @param ConfigurationManagerInterface $manager - */ - public function injectConfigurationManager(ConfigurationManagerInterface $manager) + public function __construct(ConfigurationManagerInterface $manager) { - $this->configurationManager = $manager; $settings = GeneralUtility::removeDotsFromTS( - $this->configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT) + $manager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT) ); $this->settings = $settings['plugin']['tx_eptheme']; } @@ -67,40 +58,17 @@ class EmailService implements SingletonInterface { $resolvedOptions = $this->resolveOptions($options); - /** @var MailMessage $message */ - $message = GeneralUtility::makeInstance(MailMessage::class); - $message - ->setTo([$resolvedOptions['toEmail'] => $resolvedOptions['toName']]) - ->setFrom([$resolvedOptions['fromEmail'] => $resolvedOptions['fromName']]) - ->setSubject($resolvedOptions['subject']) + /** @var FluidEmail $email */ + $email = GeneralUtility::makeInstance(FluidEmail::class); + $email + ->to(new Address($resolvedOptions['toEmail'], $resolvedOptions['toName'])) + ->from(new Address($resolvedOptions['fromEmail'], $resolvedOptions['fromName'])) + ->subject($resolvedOptions['subject']) + ->setTemplate($resolvedOptions['templateName']) + ->assignMultiple($variables) ; - $view = $this->getView($resolvedOptions['templateName']); - $view->assignMultiple($variables); - $message->setBody($view->render(), 'text/html'); - - return $message->send(); - } - - /** - * @param string $templateName - * @param string $format - * @return StandaloneView - */ - protected function getView($templateName, $format = 'html') - { - /** @var StandaloneView $view */ - $view = GeneralUtility::makeInstance(StandaloneView::class); - $view->setFormat($format); - - $view->setTemplateRootPaths($this->settings['view']['templateRootPaths']); - $view->setLayoutRootPaths($this->settings['view']['layoutRootPaths']); - $view->setPartialRootPaths($this->settings['view']['partialRootPaths']); - - $template = GeneralUtility::getFileAbsFileName('EXT:ep_theme/Resources/Private/Templates/Email/'.$templateName.'.'.$format); - $view->setTemplatePathAndFilename($template); - - return $view; + GeneralUtility::makeInstance(Mailer::class)->send($email); } /** diff --git a/public/typo3conf/ext/ep_products/Classes/Service/SearchResultUrlService.php b/public/typo3conf/ext/ep_products/Classes/Service/SearchResultUrlService.php new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/public/typo3conf/ext/ep_products/Classes/Service/SearchResultUrlService.php @@ -0,0 +1 @@ + diff --git a/public/typo3conf/ext/ep_theme/Classes/Controller/AjaxFormController.php b/public/typo3conf/ext/ep_theme/Classes/Controller/AjaxFormController.php index 5a119831..39202814 100644 --- a/public/typo3conf/ext/ep_theme/Classes/Controller/AjaxFormController.php +++ b/public/typo3conf/ext/ep_theme/Classes/Controller/AjaxFormController.php @@ -73,7 +73,7 @@ class AjaxFormController extends ActionController $this->settings['contactFormToEmail'], $this->settings['contactFormToName'], 'Kontaktformular E&P Reisen', - 'Email/ContactForm', + 'ContactForm', [ 'contactForm' => $contactForm ] ); diff --git a/public/typo3conf/ext/ep_theme/Classes/Controller/FormController.php b/public/typo3conf/ext/ep_theme/Classes/Controller/FormController.php index e5c08194..50d7acac 100644 --- a/public/typo3conf/ext/ep_theme/Classes/Controller/FormController.php +++ b/public/typo3conf/ext/ep_theme/Classes/Controller/FormController.php @@ -69,7 +69,7 @@ class FormController extends ActionController return $this->uriBuilder ->reset() ->setCreateAbsoluteUri(true) - ->setTargetPageUid($pageUid) + ->setTargetPageUid((int)$pageUid) ->build() ; } diff --git a/public/typo3conf/ext/ep_theme/Classes/Service/EmailService.php b/public/typo3conf/ext/ep_theme/Classes/Service/EmailService.php index 267ddc0e..180804ee 100644 --- a/public/typo3conf/ext/ep_theme/Classes/Service/EmailService.php +++ b/public/typo3conf/ext/ep_theme/Classes/Service/EmailService.php @@ -26,33 +26,24 @@ namespace EP\EpTheme\Service; * This copyright notice MUST APPEAR in all copies of the script! ***************************************************************/ -use TYPO3\CMS\Core\Mail\MailMessage; +use Symfony\Component\Mime\Address; +use TYPO3\CMS\Core\Mail\FluidEmail; +use TYPO3\CMS\Core\Mail\Mailer; use TYPO3\CMS\Core\SingletonInterface; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface; -use TYPO3\CMS\Fluid\View\StandaloneView; class EmailService implements SingletonInterface { - - /** - * @var ConfigurationManagerInterface - */ - protected $configurationManager; - /** * @var array */ protected $settings; - /** - * @param ConfigurationManagerInterface $manager - */ - public function injectConfigurationManager(ConfigurationManagerInterface $manager) + public function __construct(ConfigurationManagerInterface $manager) { - $this->configurationManager = $manager; $settings = GeneralUtility::removeDotsFromTS( - $this->configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT) + $manager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT) ); $this->settings = $settings['plugin']['tx_eptheme']; } @@ -63,72 +54,49 @@ class EmailService implements SingletonInterface * @param string $subject * @param string $templateName * @param array $variables - * @return bool */ public function send($toEmail, $toName, $subject, $templateName, array $variables = []) { + /** @var Mailer $mailer */ + $mailer = GeneralUtility::makeInstance(Mailer::class); $fromEmail = $this->settings['settings']['contactFormToEmail']; $fromName = $this->settings['settings']['contactFormToName']; - $enableAutoreply = $this->settings['settings']['enableContactFormAutoreply']; + $enableAutoreply = (bool)$this->settings['settings']['enableContactFormAutoreply']; $autoreplySubject = $this->settings['settings']['contactFormAutoreplySubject']; - /** @var MailMessage $message */ - $message = GeneralUtility::makeInstance(MailMessage::class); + /** @var FluidEmail $message */ + $message = GeneralUtility::makeInstance(FluidEmail::class); $message - ->setTo([$toEmail => $toName]) - ->setFrom([$fromEmail => $fromName]) - ->setSubject($subject) + ->to(new Address($toEmail, $toName)) + ->from(new Address($fromEmail, $fromName)) + ->format('html') + ->subject($subject) + ->setTemplate($templateName) + ->assignMultiple($variables) ; - $view = $this->getView($templateName); - $view->assignMultiple($variables); - $message->setBody($view->render(), 'text/html'); - - $messageSent = $message->send(); - $autoreplySent = false; + $mailer->send($message); if ($enableAutoreply) { $contactForm = $variables['contactForm']; $toEmail = $contactForm->getEmail(); $toName = $contactForm->getName(); - $templateName = 'Email/Autoreply'; + $templateName = 'Autoreply'; - /** @var MailMessage $message */ - $message = GeneralUtility::makeInstance(MailMessage::class); + /** @var FluidEmail $message */ + $message = GeneralUtility::makeInstance(FluidEmail::class); $message - ->setTo([$toEmail => $toName]) - ->setFrom([$fromEmail => $fromName]) - ->setSubject($autoreplySubject) + ->to(new Address($toEmail, $toName)) + ->from(new Address($fromEmail, $fromName)) + ->format('html') + ->subject($autoreplySubject) + ->setTemplate($templateName) + ->assignMultiple($variables) ; - $view = $this->getView($templateName); - $view->assignMultiple($variables); - $message->setBody($view->render(), 'text/html'); - - $autoreplySent = $message->send(); + $mailer->send($message); } - return $messageSent && $autoreplySent; + return true; } - - /** - * @param string $templateName - * @param string $format - * @return StandaloneView - */ - protected function getView($templateName, $format = 'html') - { - /** @var StandaloneView $view */ - $view = GeneralUtility::makeInstance(StandaloneView::class); - $view->setFormat($format); - $view->getRequest()->setControllerExtensionName('ep_events'); - - $view->setTemplateRootPaths($this->settings['view']['templateRootPaths']); - $view->setLayoutRootPaths($this->settings['view']['layoutRootPaths']); - $view->setPartialRootPaths($this->settings['view']['partialRootPaths']); - $view->setTemplate($templateName); - - return $view; - } - } diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/Autoreply.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/Autoreply.html index 9a4cd583..cbb9c75b 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/Autoreply.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/Autoreply.html @@ -2,7 +2,7 @@ xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> - +

Sehr geehrte Damen und Herren,

diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/ContactForm.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/ContactForm.html index 8a7b1c8d..cacd7aec 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/ContactForm.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/ContactForm.html @@ -2,7 +2,7 @@ xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> - +

Anfrage E&P Reisen vom

diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/GroupsPrice.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/GroupsPrice.html index 6a165088..b3247f1b 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/GroupsPrice.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Email/GroupsPrice.html @@ -2,7 +2,7 @@ xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> - +

Anfrage Gruppenhaus vom

diff --git a/public/typo3conf/ext/ep_theme/ext_localconf.php b/public/typo3conf/ext/ep_theme/ext_localconf.php index 44f4696d..f0159045 100644 --- a/public/typo3conf/ext/ep_theme/ext_localconf.php +++ b/public/typo3conf/ext/ep_theme/ext_localconf.php @@ -23,6 +23,8 @@ $GLOBALS['TYPO3_CONF_VARS']['RTE']['Presets']['default'] = 'EXT:ep_theme/Configu $GLOBALS['TYPO3_CONF_VARS']['RTE']['Presets']['ep-reisen'] = 'EXT:ep_theme/Configuration/RTE/Default.yaml'; $GLOBALS['TYPO3_CONF_VARS']['SYS']['fluid']['namespaces']['ep'] = ['EP\\EpTheme\\ViewHelpers']; +$GLOBALS['TYPO3_CONF_VARS']['MAIL']['layoutRootPaths'][700] = 'EXT:ep_theme/Resources/Private/Layouts/Email/'; +$GLOBALS['TYPO3_CONF_VARS']['MAIL']['templateRootPaths'][700] = 'EXT:ep_theme/Resources/Private/Templates/Email/'; $metaTagManagerRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\MetaTag\MetaTagManagerRegistry::class); $metaTagManagerRegistry->registerManager( diff --git a/public/typo3conf/ext/ep_track/Classes/Middleware/TrackingMiddleware.php b/public/typo3conf/ext/ep_track/Classes/Middleware/TrackingMiddleware.php index 0ab3839f..b21c408d 100644 --- a/public/typo3conf/ext/ep_track/Classes/Middleware/TrackingMiddleware.php +++ b/public/typo3conf/ext/ep_track/Classes/Middleware/TrackingMiddleware.php @@ -35,6 +35,7 @@ use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\MiddlewareInterface; use Psr\Http\Server\RequestHandlerInterface; +use TYPO3\CMS\Core\Exception\SiteNotFoundException; use TYPO3\CMS\Core\Http\NormalizedParams; use TYPO3\CMS\Core\Http\RedirectResponse; use TYPO3\CMS\Core\Site\SiteFinder; @@ -107,9 +108,24 @@ class TrackingMiddleware implements MiddlewareInterface $targetPage = $redirect['target_page_uid']; $responseCode = $redirect['response_code']; + // Fallback for old t3:// links + if (1 === preg_match('/^t3:\/\/page\?uid=(\d+)$/', $targetPage, $matches)) { + $targetPage = $matches[1]; + } + + // Skip redirecting of non-numeric page uids like full urls + if (false === is_numeric($targetPage)) { + return null; + } + /** @var SiteFinder $siteFinder */ $siteFinder = GeneralUtility::makeInstance(SiteFinder::class); - $site = $siteFinder->getSiteByPageId($targetPage); + try { + $site = $siteFinder->getSiteByPageId((int)$targetPage); + } + catch (SiteNotFoundException $exception) { + return null; + } $params = [];