From bef53f36381acd6e4f13f32f3a4cc7a282ab9570 Mon Sep 17 00:00:00 2001 From: Marvin Buchmann Date: Fri, 30 Jan 2026 14:47:47 +0100 Subject: [PATCH 1/7] Add string length validation --- Classes/Domain/Factory/SuggestFormFactory.php | 19 +++++++++++++------ Configuration/TypoScript/setup.typoscript | 4 ++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Classes/Domain/Factory/SuggestFormFactory.php b/Classes/Domain/Factory/SuggestFormFactory.php index 51cc5b3..75f0330 100644 --- a/Classes/Domain/Factory/SuggestFormFactory.php +++ b/Classes/Domain/Factory/SuggestFormFactory.php @@ -44,11 +44,9 @@ public function __construct( public function build( array $configuration, - ?string $prototypeName = null, + ?string $prototypeName = 'standard', ?ServerRequestInterface $request = null ): FormDefinition { - $prototypeName = 'standard'; - $prototypeConfiguration = $this->formConfigurationService->getPrototypeConfiguration($prototypeName); $settings = $this->configurationManager->getConfiguration( @@ -186,9 +184,18 @@ public function build( 'elementDescription', $this->getLocalizedLabel($settings['suggest']['fields']['title']['description']) ); - /** @var NotEmptyValidator $titleValidator */ - $titleValidator = $this->validatorResolver->createValidator(NotEmptyValidator::class); - $titleField->addValidator($titleValidator); + $titleStringLengthValidatorOptions = ['minimum' => $settings['suggest']['fields']['title']['validation']['min'] ?? 1]; + if ($settings['suggest']['fields']['title']['validation']['max'] ?? false) { + $titleStringLengthValidatorOptions['maximum'] = (int)$settings['suggest']['fields']['title']['validation']['max']; + } + /** @var StringLengthValidator $titleStringLengthValidator */ + $titleStringLengthValidator = $this->validatorResolver->createValidator(StringLengthValidator::class, $titleStringLengthValidatorOptions); + $titleField->addValidator($titleStringLengthValidator); + if ($titleStringLengthValidatorOptions['minimum'] > 0) { + /** @var NotEmptyValidator $titleNotEmptyValidator */ + $titleNotEmptyValidator = $this->validatorResolver->createValidator(NotEmptyValidator::class); + $titleField->addValidator($titleNotEmptyValidator); + } /** @var GenericFormElement $descriptionField */ $descriptionField = $sessionInformation->createElement('description', 'Textarea'); diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript index b976221..469f0c5 100644 --- a/Configuration/TypoScript/setup.typoscript +++ b/Configuration/TypoScript/setup.typoscript @@ -73,6 +73,10 @@ plugin.tx_sessionplaner { title { label = LLL:EXT:sessionplaner/Resources/Private/Language/locallang.xlf:form.title description = LLL:EXT:sessionplaner/Resources/Private/Language/locallang.xlf:form.title.description + validation { + min = 1 + max = 255 + } } description { label = LLL:EXT:sessionplaner/Resources/Private/Language/locallang.xlf:form.description From abf00bcaf533dc653ab32e09ffba52c327f8b69d Mon Sep 17 00:00:00 2001 From: Marvin Buchmann Date: Mon, 2 Feb 2026 15:03:38 +0100 Subject: [PATCH 2/7] Add subtitle field --- Classes/Domain/Factory/SuggestFormFactory.php | 25 +++++++++++++++++++ .../Domain/Finisher/SuggestFormFinisher.php | 1 + Classes/Domain/Model/Session.php | 12 +++++++++ .../tx_sessionplaner_domain_model_session.php | 12 +++++++++ Configuration/TypoScript/setup.typoscript | 9 +++++++ Resources/Private/Language/locallang.xlf | 6 +++++ Resources/Private/Language/locallang_tca.xlf | 3 +++ Resources/Private/Templates/Session/Show.html | 5 ++++ Resources/Public/Stylesheets/frontend.css | 4 +-- ext_tables.sql | 1 + 10 files changed, 76 insertions(+), 2 deletions(-) diff --git a/Classes/Domain/Factory/SuggestFormFactory.php b/Classes/Domain/Factory/SuggestFormFactory.php index 75f0330..c87d653 100644 --- a/Classes/Domain/Factory/SuggestFormFactory.php +++ b/Classes/Domain/Factory/SuggestFormFactory.php @@ -197,6 +197,31 @@ public function build( $titleField->addValidator($titleNotEmptyValidator); } + if ((bool)($settings['suggest']['fields']['subtitle']['enable'] ?? false) === true) { + /** @var GenericFormElement $subtitleField */ + $subtitleField = $sessionInformation->createElement('subtitle', 'Text'); + $subtitleField->setLabel($this->getLocalizedLabel($settings['suggest']['fields']['subtitle']['label'])); + $subtitleField->setProperty( + 'elementDescription', + $this->getLocalizedLabel($settings['suggest']['fields']['subtitle']['description']) + ); + $subtitleStringLengthValidatorOptions = ['minimum' => $settings['suggest']['fields']['subtitle']['validation']['min'] ?? 1]; + if ($settings['suggest']['fields']['subtitle']['validation']['max'] ?? false) { + $subtitleStringLengthValidatorOptions['maximum'] = (int)$settings['suggest']['fields']['subtitle']['validation']['max']; + } + /** @var StringLengthValidator $subtitleStringLengthValidator */ + $subtitleStringLengthValidator = $this->validatorResolver->createValidator( + StringLengthValidator::class, + $subtitleStringLengthValidatorOptions + ); + $subtitleField->addValidator($subtitleStringLengthValidator); + if ($subtitleStringLengthValidatorOptions['minimum'] > 0) { + /** @var NotEmptyValidator $subtitleNotEmptyValidator */ + $subtitleNotEmptyValidator = $this->validatorResolver->createValidator(NotEmptyValidator::class); + $subtitleField->addValidator($subtitleNotEmptyValidator); + } + } + /** @var GenericFormElement $descriptionField */ $descriptionField = $sessionInformation->createElement('description', 'Textarea'); $descriptionField->setLabel($this->getLocalizedLabel($settings['suggest']['fields']['description']['label'])); diff --git a/Classes/Domain/Finisher/SuggestFormFinisher.php b/Classes/Domain/Finisher/SuggestFormFinisher.php index 8182f44..34dd8c4 100644 --- a/Classes/Domain/Finisher/SuggestFormFinisher.php +++ b/Classes/Domain/Finisher/SuggestFormFinisher.php @@ -70,6 +70,7 @@ protected function executeInternal() } $session->setTopic((string)($data['title'] ?? '')); + $session->setTopicAddition((string)($data['subtitle'] ?? '')); $session->setDescription((string)($data['description'] ?? '')); if (isset($data['type']) && $data['type'] !== '') { diff --git a/Classes/Domain/Model/Session.php b/Classes/Domain/Model/Session.php index badc9a0..cc3015a 100644 --- a/Classes/Domain/Model/Session.php +++ b/Classes/Domain/Model/Session.php @@ -35,6 +35,8 @@ class Session extends AbstractSlugEntity */ protected string $topic = ''; + protected string $topicAddition = ''; + protected string $pathSegment = ''; protected string $description = ''; @@ -146,6 +148,16 @@ public function getTopic(): string return $this->topic; } + public function setTopicAddition(string $topicAddition): void + { + $this->topicAddition = $topicAddition; + } + + public function getTopicAddition(): string + { + return $this->topicAddition; + } + public function setPathSegment(string $pathSegment): void { $this->pathSegment = $pathSegment; diff --git a/Configuration/TCA/tx_sessionplaner_domain_model_session.php b/Configuration/TCA/tx_sessionplaner_domain_model_session.php index 132eaff..2c8a97d 100644 --- a/Configuration/TCA/tx_sessionplaner_domain_model_session.php +++ b/Configuration/TCA/tx_sessionplaner_domain_model_session.php @@ -72,6 +72,17 @@ 'max' => 256, ], ], + 'topic_addition' => [ + 'exclude' => false, + 'label' => $languageFile . 'tx_sessionplaner_domain_model_session-topic_addition', + 'config' => [ + 'type' => 'input', + 'size' => 40, + 'eval' => 'trim', + 'required' => false, + 'max' => 256, + ], + ], 'path_segment' => [ 'exclude' => false, 'label' => $languageFile . 'tx_sessionplaner_domain_model_session-path_segment', @@ -341,6 +352,7 @@ --div--;General, --palette--;' . $languageFile . 'tx_sessionplaner_domain_model_session.palettes.options;options, topic, + topic_addition, path_segment, description, --palette--;' . $languageFile diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript index 469f0c5..7986009 100644 --- a/Configuration/TypoScript/setup.typoscript +++ b/Configuration/TypoScript/setup.typoscript @@ -78,6 +78,15 @@ plugin.tx_sessionplaner { max = 255 } } + subtitle { + enable = 0 + label = LLL:EXT:sessionplaner/Resources/Private/Language/locallang.xlf:form.subtitle + description = LLL:EXT:sessionplaner/Resources/Private/Language/locallang.xlf:form.subtitle.description + validation { + min = 0 + max = 255 + } + } description { label = LLL:EXT:sessionplaner/Resources/Private/Language/locallang.xlf:form.description description = LLL:EXT:sessionplaner/Resources/Private/Language/locallang.xlf:form.description.description diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf index f163f33..09e6f93 100644 --- a/Resources/Private/Language/locallang.xlf +++ b/Resources/Private/Language/locallang.xlf @@ -209,6 +209,12 @@ A descriptive title for your submission + + Subtitle + + + A descriptive subtitle for your submission + Description diff --git a/Resources/Private/Language/locallang_tca.xlf b/Resources/Private/Language/locallang_tca.xlf index 65a84cd..f213bbb 100644 --- a/Resources/Private/Language/locallang_tca.xlf +++ b/Resources/Private/Language/locallang_tca.xlf @@ -135,6 +135,9 @@ Topic + + Topic Addition + Path Segment diff --git a/Resources/Private/Templates/Session/Show.html b/Resources/Private/Templates/Session/Show.html index fa714dc..3e7c16e 100644 --- a/Resources/Private/Templates/Session/Show.html +++ b/Resources/Private/Templates/Session/Show.html @@ -22,6 +22,11 @@

{session.topic}

+ +
+

{session.topicAddition}

+
+
diff --git a/Resources/Public/Stylesheets/frontend.css b/Resources/Public/Stylesheets/frontend.css index 259fba6..07119f8 100644 --- a/Resources/Public/Stylesheets/frontend.css +++ b/Resources/Public/Stylesheets/frontend.css @@ -54,7 +54,7 @@ border-radius: var(--session-tag-border-radius); } -.sessionplaner-tag-title { +.sessionplaner-tag-title, .sessionplaner-tag-subtitle { --session-tag-title-decoration-color: inherit; text-decoration-line: underline; text-decoration-thickness: 5px; @@ -730,4 +730,4 @@ width: 100%; } -/*# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../Build/Sources/Sass/frontend/_general.scss","frontend.css","../../../Build/Sources/Sass/frontend/_day.scss","../../../Build/Sources/Sass/frontend/_tag.scss","../../../Build/Sources/Sass/frontend/_track.scss","../../../Build/Sources/Sass/frontend/_room.scss","../../../Build/Sources/Sass/frontend/_session.scss","../../../Build/Sources/Sass/frontend/_slot.scss","../../../Build/Sources/Sass/frontend/_speaker.scss","../../../Build/Sources/Sass/frontend/_bio.scss","../../../Build/Sources/Sass/frontend/_list.scss","../../../Build/Sources/Sass/frontend/_connect.scss"],"names":[],"mappings":"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","file":"frontend.css"} */ \ No newline at end of file +/*# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../Build/Sources/Sass/frontend/_general.scss","frontend.css","../../../Build/Sources/Sass/frontend/_day.scss","../../../Build/Sources/Sass/frontend/_tag.scss","../../../Build/Sources/Sass/frontend/_track.scss","../../../Build/Sources/Sass/frontend/_room.scss","../../../Build/Sources/Sass/frontend/_session.scss","../../../Build/Sources/Sass/frontend/_slot.scss","../../../Build/Sources/Sass/frontend/_speaker.scss","../../../Build/Sources/Sass/frontend/_bio.scss","../../../Build/Sources/Sass/frontend/_list.scss","../../../Build/Sources/Sass/frontend/_connect.scss"],"names":[],"mappings":"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","file":"frontend.css"} */ diff --git a/ext_tables.sql b/ext_tables.sql index 72c9a2a..dfbe165 100644 --- a/ext_tables.sql +++ b/ext_tables.sql @@ -45,6 +45,7 @@ CREATE TABLE tx_sessionplaner_domain_model_slot CREATE TABLE tx_sessionplaner_domain_model_session ( topic varchar (255) DEFAULT '' NOT NULL, + topic_addition varchar (255) DEFAULT '' NOT NULL, path_segment varchar(2048), speaker varchar(255) DEFAULT '' NOT NULL, twitter varchar(255) DEFAULT '' NOT NULL, From 17bbab1b8e85c89efd8b020f5909462baccb14b9 Mon Sep 17 00:00:00 2001 From: Marvin Buchmann Date: Mon, 2 Feb 2026 16:50:24 +0100 Subject: [PATCH 3/7] Add tag suggestion field --- Classes/Domain/Factory/SuggestFormFactory.php | 25 +++++++++++++++++++ .../Domain/Finisher/SuggestFormFinisher.php | 1 + Classes/Domain/Model/Session.php | 12 +++++++++ .../tx_sessionplaner_domain_model_session.php | 11 ++++++++ Configuration/TypoScript/setup.typoscript | 9 +++++++ Resources/Private/Language/locallang.xlf | 6 +++++ Resources/Private/Language/locallang_tca.xlf | 3 +++ ext_tables.sql | 1 + 8 files changed, 68 insertions(+) diff --git a/Classes/Domain/Factory/SuggestFormFactory.php b/Classes/Domain/Factory/SuggestFormFactory.php index c87d653..332e068 100644 --- a/Classes/Domain/Factory/SuggestFormFactory.php +++ b/Classes/Domain/Factory/SuggestFormFactory.php @@ -240,6 +240,31 @@ public function build( ); $descriptionField->addValidator($stringLengthValidator); + if ((bool)($settings['suggest']['fields']['tag_suggestion']['enable'] ?? false) === true) { + /** @var GenericFormElement $tagSuggestionField */ + $tagSuggestionField = $sessionInformation->createElement('tag_suggestion', 'Text'); + $tagSuggestionField->setLabel($this->getLocalizedLabel($settings['suggest']['fields']['tag_suggestion']['label'])); + $tagSuggestionField->setProperty( + 'elementDescription', + $this->getLocalizedLabel($settings['suggest']['fields']['tag_suggestion']['description']) + ); + $tagSuggestionStringLengthValidatorOptions = ['minimum' => $settings['suggest']['fields']['tag_suggestion']['validation']['min'] ?? 1]; + if ($settings['suggest']['fields']['tag_suggestion']['validation']['max'] ?? false) { + $tagSuggestionStringLengthValidatorOptions['maximum'] = (int)$settings['suggest']['fields']['tag_suggestion']['validation']['max']; + } + /** @var StringLengthValidator $tagSuggestionStringLengthValidator */ + $tagSuggestionStringLengthValidator = $this->validatorResolver->createValidator( + StringLengthValidator::class, + $tagSuggestionStringLengthValidatorOptions + ); + $tagSuggestionField->addValidator($tagSuggestionStringLengthValidator); + if ($tagSuggestionStringLengthValidatorOptions['minimum'] > 0) { + /** @var NotEmptyValidator $tagSuggestionNotEmptyValidator */ + $tagSuggestionNotEmptyValidator = $this->validatorResolver->createValidator(NotEmptyValidator::class); + $tagSuggestionField->addValidator($tagSuggestionNotEmptyValidator); + } + } + if ((bool)($settings['suggest']['fields']['length']['enable'] ?? false) === true) { /** @var GenericFormElement $lengthField */ $lengthField = $sessionInformation->createElement('estimatedlength', 'SingleSelect'); diff --git a/Classes/Domain/Finisher/SuggestFormFinisher.php b/Classes/Domain/Finisher/SuggestFormFinisher.php index 34dd8c4..f8412ff 100644 --- a/Classes/Domain/Finisher/SuggestFormFinisher.php +++ b/Classes/Domain/Finisher/SuggestFormFinisher.php @@ -72,6 +72,7 @@ protected function executeInternal() $session->setTopic((string)($data['title'] ?? '')); $session->setTopicAddition((string)($data['subtitle'] ?? '')); $session->setDescription((string)($data['description'] ?? '')); + $session->setTagSuggestion((string)($data['tag_suggestion'] ?? '')); if (isset($data['type']) && $data['type'] !== '') { $session->setType((int)$data['type']); diff --git a/Classes/Domain/Model/Session.php b/Classes/Domain/Model/Session.php index cc3015a..8d07b9c 100644 --- a/Classes/Domain/Model/Session.php +++ b/Classes/Domain/Model/Session.php @@ -41,6 +41,8 @@ class Session extends AbstractSlugEntity protected string $description = ''; + protected string $tagSuggestion = ''; + protected string $speaker = ''; protected string $twitter = ''; @@ -178,6 +180,16 @@ public function getDescription(): string return $this->description; } + public function setTagSuggestion(string $tagSuggestion): void + { + $this->tagSuggestion = $tagSuggestion; + } + + public function getTagSuggestion(): string + { + return $this->tagSuggestion; + } + public function addSpeaker(Speaker $speaker): void { $this->speakers->attach($speaker); diff --git a/Configuration/TCA/tx_sessionplaner_domain_model_session.php b/Configuration/TCA/tx_sessionplaner_domain_model_session.php index 2c8a97d..3598214 100644 --- a/Configuration/TCA/tx_sessionplaner_domain_model_session.php +++ b/Configuration/TCA/tx_sessionplaner_domain_model_session.php @@ -167,6 +167,17 @@ 'richtextConfiguration' => 'default', ], ], + 'tag_suggestion' => [ + 'exclude' => false, + 'label' => $languageFile . 'tx_sessionplaner_domain_model_session-tag_suggestion', + 'config' => [ + 'type' => 'input', + 'size' => 40, + 'eval' => 'trim', + 'required' => false, + 'max' => 256, + ], + ], 'documents' => [ 'exclude' => false, 'label' => $languageFile . 'tx_sessionplaner_domain_model_session-download', diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript index 7986009..9f4c5c9 100644 --- a/Configuration/TypoScript/setup.typoscript +++ b/Configuration/TypoScript/setup.typoscript @@ -87,6 +87,15 @@ plugin.tx_sessionplaner { max = 255 } } + tag_suggestion { + enable = 0 + label = LLL:EXT:sessionplaner/Resources/Private/Language/locallang.xlf:form.tag_suggestion + description = LLL:EXT:sessionplaner/Resources/Private/Language/locallang.xlf:form.tag_suggestion.description + validation { + min = 0 + max = 255 + } + } description { label = LLL:EXT:sessionplaner/Resources/Private/Language/locallang.xlf:form.description description = LLL:EXT:sessionplaner/Resources/Private/Language/locallang.xlf:form.description.description diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf index 09e6f93..f4ae8bd 100644 --- a/Resources/Private/Language/locallang.xlf +++ b/Resources/Private/Language/locallang.xlf @@ -221,6 +221,12 @@ A description of your submission + + Tag Suggestion + + + A descriptive tag you would add to your submission + Type diff --git a/Resources/Private/Language/locallang_tca.xlf b/Resources/Private/Language/locallang_tca.xlf index f213bbb..b25e77f 100644 --- a/Resources/Private/Language/locallang_tca.xlf +++ b/Resources/Private/Language/locallang_tca.xlf @@ -132,6 +132,9 @@ Do not link + + Tag Suggestion + Topic diff --git a/ext_tables.sql b/ext_tables.sql index dfbe165..401797f 100644 --- a/ext_tables.sql +++ b/ext_tables.sql @@ -58,6 +58,7 @@ CREATE TABLE tx_sessionplaner_domain_model_session requesttype int(11) unsigned DEFAULT '0' NOT NULL, norecording tinyint(4) unsigned DEFAULT '0' NOT NULL, description text, + tag_suggestion varchar (255) DEFAULT '' NOT NULL, # references speakers int(11) unsigned DEFAULT '0' NOT NULL, From 0503c5cd3e33d4e4ce0a42e50fabd8ad3c083eb6 Mon Sep 17 00:00:00 2001 From: Marvin Buchmann Date: Tue, 3 Feb 2026 09:22:20 +0100 Subject: [PATCH 4/7] Add email to sender finisher --- Classes/Domain/Factory/SuggestFormFactory.php | 43 ++++++++++++++-- Configuration/TypoScript/constants.typoscript | 11 +++++ Configuration/TypoScript/setup.typoscript | 6 +++ .../Templates/Email/EmailToSender.html | 49 +++++++++++++++++++ .../Private/Templates/Email/EmailToSender.txt | 18 +++++++ 5 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 Resources/Private/Templates/Email/EmailToSender.html create mode 100644 Resources/Private/Templates/Email/EmailToSender.txt diff --git a/Classes/Domain/Factory/SuggestFormFactory.php b/Classes/Domain/Factory/SuggestFormFactory.php index 332e068..ef7dd04 100644 --- a/Classes/Domain/Factory/SuggestFormFactory.php +++ b/Classes/Domain/Factory/SuggestFormFactory.php @@ -344,15 +344,38 @@ public function build( ]); } + $message = $settings['suggest']['confirmation']['message'] ?? + 'LLL:EXT:sessionplaner/Resources/Private/Language/locallang.xlf:form.suggest.confirmation'; + $confirmationMessage = LocalizationUtility::translate($message) ?? ''; + + if ($this->sendingSenderNotificationAllowed($settings)) { + $form->createFinisher('EmailToSender', [ + 'subject' => $settings['suggest']['senderNotification']['subject'], + 'recipients' => [ + '{email}' => '{fullname}', + ], + 'senderAddress' => $settings['suggest']['senderNotification']['senderAddress'], + 'senderName' => $settings['suggest']['senderNotification']['senderName'], + 'format' => 'html', + 'headline' => $settings['suggest']['senderNotification']['subject'], + 'variables' => [ + 'title' => $settings['suggest']['senderNotification']['subject'], + 'message' => $confirmationMessage, + ], + 'templateName' => 'EmailToSender', + 'templateRootPaths' => [ + 100 => 'EXT:sessionplaner/Resources/Private/Templates/Email/' + ], + ]); + } + if (($settings['suggest']['confirmation']['pageUid'] ?? '') !== '') { $form->createFinisher('Redirect', [ 'pageUid' => (int)$settings['suggest']['confirmation']['pageUid'], ]); } else { - $message = $settings['suggest']['confirmation']['message'] ?? - 'LLL:EXT:sessionplaner/Resources/Private/Language/locallang.xlf:form.suggest.confirmation'; $form->createFinisher('Confirmation', [ - 'message' => LocalizationUtility::translate($message) ?? '', + 'message' => $confirmationMessage, ]); } @@ -378,6 +401,20 @@ protected function sendingNotificationAllowed(array $settings): bool && $settings['suggest']['notification']['senderName'] !== ''; } + protected function sendingSenderNotificationAllowed(array $settings): bool + { + return isset( + $settings['suggest']['senderNotification']['enable'], + $settings['suggest']['senderNotification']['subject'], + $settings['suggest']['senderNotification']['senderAddress'], + $settings['suggest']['senderNotification']['senderName'] + ) + && (bool)$settings['suggest']['senderNotification']['enable'] === true + && $settings['suggest']['senderNotification']['subject'] !== '' + && $settings['suggest']['senderNotification']['senderAddress'] !== '' + && $settings['suggest']['senderNotification']['senderName'] !== ''; + } + protected function getLocalizedLabel(string $label): string { if (strncmp($label, 'LLL:', 4) === 0) { diff --git a/Configuration/TypoScript/constants.typoscript b/Configuration/TypoScript/constants.typoscript index ec54a92..6f8fe4c 100644 --- a/Configuration/TypoScript/constants.typoscript +++ b/Configuration/TypoScript/constants.typoscript @@ -2,6 +2,7 @@ # customsubcategory=110_SPPERSISTENCE=Persistence # customsubcategory=120_SPSETTINGS=Settings # customsubcategory=130_SPSUGGESTMAIL=Suggest Notifications +# customsubcategory=135_SPSUGGESTSENDERMAIL=Suggest Notifications to Sender # customsubcategory=140_SPSUGGESTCONFIRMATION=Suggest Confirmation plugin.tx_sessionplaner { @@ -48,6 +49,16 @@ plugin.tx_sessionplaner { # cat=plugin.sessionplaner/130_SPSUGGESTMAIL/blindCarbonCopyAddress; type=string; label=Blind Carbon Copy Address blindCarbonCopyAddress = } + senderNotification { + # cat=plugin.sessionplaner/135_SPSUGGESTSENDERMAIL/enable; type=boolean; label=Enable + enable = 0 + # cat=plugin.sessionplaner/135_SPSUGGESTSENDERMAIL/subject; type=string; label=Subject + subject = Thank you for your suggestion + # cat=plugin.sessionplaner/135_SPSUGGESTSENDERMAIL/senderAddress; type=string; label=Sender Address + senderAddress = + # cat=plugin.sessionplaner/135_SPSUGGESTSENDERMAIL/senderName; type=string; label=Sender Name + senderName = + } confirmation { # cat=plugin.sessionplaner/140_SPSUGGESTCONFIRMATION/message; type=string; label=Confirmation Message message = LLL:EXT:sessionplaner/Resources/Private/Language/locallang.xlf:form.suggest.confirmation diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript index 9f4c5c9..fe037a4 100644 --- a/Configuration/TypoScript/setup.typoscript +++ b/Configuration/TypoScript/setup.typoscript @@ -127,6 +127,12 @@ plugin.tx_sessionplaner { carbonCopyAddress = {$plugin.tx_sessionplaner.settings.suggest.notification.carbonCopyAddress} blindCarbonCopyAddress = {$plugin.tx_sessionplaner.settings.suggest.notification.blindCarbonCopyAddress} } + senderNotification { + enable = {$plugin.tx_sessionplaner.settings.suggest.senderNotification.enable} + subject = {$plugin.tx_sessionplaner.settings.suggest.senderNotification.subject} + senderAddress = {$plugin.tx_sessionplaner.settings.suggest.senderNotification.senderAddress} + senderName = {$plugin.tx_sessionplaner.settings.suggest.senderNotification.senderName} + } confirmation { message = {$plugin.tx_sessionplaner.settings.suggest.confirmation.message} pageUid = {$plugin.tx_sessionplaner.settings.suggest.confirmation.pageUid} diff --git a/Resources/Private/Templates/Email/EmailToSender.html b/Resources/Private/Templates/Email/EmailToSender.html new file mode 100644 index 0000000..e068f83 --- /dev/null +++ b/Resources/Private/Templates/Email/EmailToSender.html @@ -0,0 +1,49 @@ + +{title} + + +

{message}

+
+ + + + + + + + + + + + + + + +
{formvh:translateElementProperty(element: formValue.element, property: 'label')}{formvh:translateElementProperty(element: formValue.element, property: 'label')} + + + + + + + + + + +
{value}
+ + + + + + +
{formValue.processedValue}
+ + + + + - + + +
+ diff --git a/Resources/Private/Templates/Email/EmailToSender.txt b/Resources/Private/Templates/Email/EmailToSender.txt new file mode 100644 index 0000000..9f69bb5 --- /dev/null +++ b/Resources/Private/Templates/Email/EmailToSender.txt @@ -0,0 +1,18 @@ + +{title} + +{message} + + + + + *** ***: - {singleValue} + + + + *** ***: {formValue.processedValue -> f:format.raw()}- + + + + + From 4cefbc4e44998bf020a9c807134a62632cc37a94 Mon Sep 17 00:00:00 2001 From: Marvin Buchmann Date: Tue, 3 Feb 2026 09:39:10 +0100 Subject: [PATCH 5/7] Add tag suggestion to showitems --- Configuration/TCA/tx_sessionplaner_domain_model_session.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Configuration/TCA/tx_sessionplaner_domain_model_session.php b/Configuration/TCA/tx_sessionplaner_domain_model_session.php index 3598214..ebf3452 100644 --- a/Configuration/TCA/tx_sessionplaner_domain_model_session.php +++ b/Configuration/TCA/tx_sessionplaner_domain_model_session.php @@ -379,6 +379,7 @@ day, room, slot, + tag_suggestion, tags, ', ], From 70f466609c111c94a95514ad75e5b526be8c5fcd Mon Sep 17 00:00:00 2001 From: Marvin Buchmann Date: Tue, 3 Feb 2026 09:43:52 +0100 Subject: [PATCH 6/7] Fix indentation --- ext_tables.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext_tables.sql b/ext_tables.sql index 401797f..483cbb2 100644 --- a/ext_tables.sql +++ b/ext_tables.sql @@ -45,7 +45,7 @@ CREATE TABLE tx_sessionplaner_domain_model_slot CREATE TABLE tx_sessionplaner_domain_model_session ( topic varchar (255) DEFAULT '' NOT NULL, - topic_addition varchar (255) DEFAULT '' NOT NULL, + topic_addition varchar (255) DEFAULT '' NOT NULL, path_segment varchar(2048), speaker varchar(255) DEFAULT '' NOT NULL, twitter varchar(255) DEFAULT '' NOT NULL, @@ -58,7 +58,7 @@ CREATE TABLE tx_sessionplaner_domain_model_session requesttype int(11) unsigned DEFAULT '0' NOT NULL, norecording tinyint(4) unsigned DEFAULT '0' NOT NULL, description text, - tag_suggestion varchar (255) DEFAULT '' NOT NULL, + tag_suggestion varchar (255) DEFAULT '' NOT NULL, # references speakers int(11) unsigned DEFAULT '0' NOT NULL, From e33a743b7277d58bc9b41fbe6d63b43a4beac44f Mon Sep 17 00:00:00 2001 From: Marvin Buchmann Date: Tue, 3 Feb 2026 10:46:25 +0100 Subject: [PATCH 7/7] Revert drive-by --- Classes/Domain/Factory/SuggestFormFactory.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Classes/Domain/Factory/SuggestFormFactory.php b/Classes/Domain/Factory/SuggestFormFactory.php index ef7dd04..71a7679 100644 --- a/Classes/Domain/Factory/SuggestFormFactory.php +++ b/Classes/Domain/Factory/SuggestFormFactory.php @@ -44,9 +44,11 @@ public function __construct( public function build( array $configuration, - ?string $prototypeName = 'standard', + ?string $prototypeName = null, ?ServerRequestInterface $request = null ): FormDefinition { + $prototypeName = 'standard'; + $prototypeConfiguration = $this->formConfigurationService->getPrototypeConfiguration($prototypeName); $settings = $this->configurationManager->getConfiguration(