From 0780d247e6916337a562edb0fc3e0e75aa720516 Mon Sep 17 00:00:00 2001 From: weakbit Date: Wed, 7 Dec 2022 16:01:15 +0100 Subject: [PATCH 01/12] TYPO3v11 Compatibility --- composer.json | 4 ++-- pi1/class.tx_datamintsfeuser_pi1.php | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index d68cbe2..3c8c70f 100644 --- a/composer.json +++ b/composer.json @@ -28,8 +28,8 @@ "issues": "http://forge.typo3.org/projects/extension-datamints_feuser" }, "require": { - "php": ">=5.3.7,<=7.99.99", - "typo3/cms-core": ">=6.2.0,<=10.99.990" + "php": ">=5.3.7,<=8.1.99", + "typo3/cms-core": ">=6.2.0,<=11.99.990" }, "suggest": { "typo3db_legacy": ">=1.0.0,<=1.0.99" diff --git a/pi1/class.tx_datamintsfeuser_pi1.php b/pi1/class.tx_datamintsfeuser_pi1.php index 9bc341d..bdab194 100644 --- a/pi1/class.tx_datamintsfeuser_pi1.php +++ b/pi1/class.tx_datamintsfeuser_pi1.php @@ -113,7 +113,11 @@ public function main($content, $conf) { $this->frontendController = $this->frontendController ?: $GLOBALS['TSFE']; $this->templateService = $this->templateService ?: $this->cObj; - $this->pageRepository = GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\Page\\PageRepository'); + if (defined('TYPO3_branch') && (int)TYPO3_branch % 11 === 0) { + $this->pageRepository = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Domain\Repository\PageRepository::class); + } else { + $this->pageRepository = GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\Page\\PageRepository'); + } // Debug. // $this->frontendController->set_no_cache(); From 6b24184fda8f66fd8791512a3cdb522f5db8f1c8 Mon Sep 17 00:00:00 2001 From: Benjamin Stiber Date: Thu, 8 Dec 2022 10:18:50 +0100 Subject: [PATCH 02/12] [BUGFIX] fix array access with curly braces --- lib/class.tx_datamintsfeuser_utils.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 lib/class.tx_datamintsfeuser_utils.php diff --git a/lib/class.tx_datamintsfeuser_utils.php b/lib/class.tx_datamintsfeuser_utils.php old mode 100644 new mode 100755 index 96d08fe..3b95aaf --- a/lib/class.tx_datamintsfeuser_utils.php +++ b/lib/class.tx_datamintsfeuser_utils.php @@ -204,7 +204,7 @@ public static function generatePassword($password, $arrGenerate = array()) { $arrPassword['normal'] = ''; for ($i = 0; $i < (($arrGenerate['length']) ? $arrGenerate['length'] : 8); $i++) { - $arrPassword['normal'] .= $chars{mt_rand(0, strlen($chars))}; + $arrPassword['normal'] .= $chars[mt_rand(0, strlen($chars))]; } } From 9686c01c54c3015e000cb30a84a04c6ddbaef4ba Mon Sep 17 00:00:00 2001 From: Benjamin Stiber Date: Fri, 27 Jan 2023 16:54:48 +0100 Subject: [PATCH 03/12] [BUGFIX] fix errors while registrating and sending mails, fix selects in flexform --- flexform/sheet_edit.xml | 1 + flexform/sheet_registration.xml | 3 +++ lib/class.tx_datamintsfeuser_utils.php | 3 ++- pi1/class.tx_datamintsfeuser_pi1.php | 3 +-- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/flexform/sheet_edit.xml b/flexform/sheet_edit.xml index f0fc97d..b21a4e2 100644 --- a/flexform/sheet_edit.xml +++ b/flexform/sheet_edit.xml @@ -49,6 +49,7 @@ select + selectMultipleSideBySide diff --git a/flexform/sheet_registration.xml b/flexform/sheet_registration.xml index 8b7935a..78cfc2d 100644 --- a/flexform/sheet_registration.xml +++ b/flexform/sheet_registration.xml @@ -31,6 +31,7 @@ select + selectMultipleSideBySide 3 5 0 @@ -78,6 +79,7 @@ select + selectMultipleSideBySide 3 5 0 @@ -122,6 +124,7 @@ select + selectMultipleSideBySide diff --git a/lib/class.tx_datamintsfeuser_utils.php b/lib/class.tx_datamintsfeuser_utils.php index 3b95aaf..cc3bd3d 100755 --- a/lib/class.tx_datamintsfeuser_utils.php +++ b/lib/class.tx_datamintsfeuser_utils.php @@ -394,7 +394,8 @@ public static function convertHtmlEmailToPlain($content) { */ public static function getTemplateSubpart($templateFile, $templatePart, $markerArray = array()) { // Template laden. - $fileFolder = \TYPO3\CMS\Core\Resource\ResourceFactory::getInstance()->retrieveFileOrFolderObject($templateFile); + $resourceFactory = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\ResourceFactory::class); + $fileFolder = $resourceFactory->retrieveFileOrFolderObject($templateFile); if (!$fileFolder && class_exists('TYPO3\\CMS\\Core\\LinkHandling\\LinkService')) { $result = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\LinkHandling\\LinkService')->resolve($templateFile); diff --git a/pi1/class.tx_datamintsfeuser_pi1.php b/pi1/class.tx_datamintsfeuser_pi1.php index bdab194..94fff82 100644 --- a/pi1/class.tx_datamintsfeuser_pi1.php +++ b/pi1/class.tx_datamintsfeuser_pi1.php @@ -1679,8 +1679,7 @@ public function sendMail($userId, $templatePart, $adminMail, $config, $extraMark $mail->setFrom(array($fromEmail => $fromName)); $mail->setReplyTo(array($replytoEmail => $replytoName)); $mail->setTo(array($toEmail => $toName)); - $mail->setBody($bodyPlain); - $mail->setCharset($this->frontendController->metaCharset); + $mail->html($bodyPlain); if ($config['mailtype'] == 'html') { $mail->addPart($bodyHtml, 'text/html', $this->frontendController->metaCharset); From ec485009ceb47c35a051fbebe69734cb676e2de3 Mon Sep 17 00:00:00 2001 From: Benjamin Stiber Date: Tue, 14 Feb 2023 12:43:16 +0100 Subject: [PATCH 04/12] [BUGFIX] fix rendering of html emails --- pi1/class.tx_datamintsfeuser_pi1.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pi1/class.tx_datamintsfeuser_pi1.php b/pi1/class.tx_datamintsfeuser_pi1.php index 94fff82..4e1c67f 100644 --- a/pi1/class.tx_datamintsfeuser_pi1.php +++ b/pi1/class.tx_datamintsfeuser_pi1.php @@ -1682,7 +1682,8 @@ public function sendMail($userId, $templatePart, $adminMail, $config, $extraMark $mail->html($bodyPlain); if ($config['mailtype'] == 'html') { - $mail->addPart($bodyHtml, 'text/html', $this->frontendController->metaCharset); + $mail->html($bodyHtml); + $mail->text($bodyPlain); } $mail->send(); From 0d1600eebd1f4312a96eb584e4a8ff3e8a2198f2 Mon Sep 17 00:00:00 2001 From: Benjamin Stiber Date: Tue, 14 Feb 2023 12:55:45 +0100 Subject: [PATCH 05/12] [CLEANUP] indents --- pi1/class.tx_datamintsfeuser_pi1.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pi1/class.tx_datamintsfeuser_pi1.php b/pi1/class.tx_datamintsfeuser_pi1.php index 4e1c67f..712b76e 100644 --- a/pi1/class.tx_datamintsfeuser_pi1.php +++ b/pi1/class.tx_datamintsfeuser_pi1.php @@ -1682,8 +1682,8 @@ public function sendMail($userId, $templatePart, $adminMail, $config, $extraMark $mail->html($bodyPlain); if ($config['mailtype'] == 'html') { - $mail->html($bodyHtml); - $mail->text($bodyPlain); + $mail->html($bodyHtml); + $mail->text($bodyPlain); } $mail->send(); From 0ace7fde3ce5b7b227bfa0aa72cb68f1e0b966be Mon Sep 17 00:00:00 2001 From: Benjamin Stiber Date: Tue, 14 Feb 2023 12:56:45 +0100 Subject: [PATCH 06/12] [CLEANUP] indents v2 --- pi1/class.tx_datamintsfeuser_pi1.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pi1/class.tx_datamintsfeuser_pi1.php b/pi1/class.tx_datamintsfeuser_pi1.php index 712b76e..6baf0dd 100644 --- a/pi1/class.tx_datamintsfeuser_pi1.php +++ b/pi1/class.tx_datamintsfeuser_pi1.php @@ -1682,8 +1682,8 @@ public function sendMail($userId, $templatePart, $adminMail, $config, $extraMark $mail->html($bodyPlain); if ($config['mailtype'] == 'html') { - $mail->html($bodyHtml); - $mail->text($bodyPlain); + $mail->html($bodyHtml); + $mail->text($bodyPlain); } $mail->send(); From bcdd29aa5d13762dbc24c07ee17f27ec8aafd469 Mon Sep 17 00:00:00 2001 From: Weakbit Date: Thu, 2 Mar 2023 13:34:18 +0100 Subject: [PATCH 07/12] Fix loading extension configuration --- .../TypoScript/{constants.txt => constants.typoscript} | 0 Configuration/TypoScript/{setup.txt => setup.typoscript} | 0 pi1/class.tx_datamintsfeuser_pi1.php | 2 +- pi1/de.locallang.xlf | 2 +- pi1/locallang.xlf | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename Configuration/TypoScript/{constants.txt => constants.typoscript} (100%) rename Configuration/TypoScript/{setup.txt => setup.typoscript} (100%) diff --git a/Configuration/TypoScript/constants.txt b/Configuration/TypoScript/constants.typoscript similarity index 100% rename from Configuration/TypoScript/constants.txt rename to Configuration/TypoScript/constants.typoscript diff --git a/Configuration/TypoScript/setup.txt b/Configuration/TypoScript/setup.typoscript similarity index 100% rename from Configuration/TypoScript/setup.txt rename to Configuration/TypoScript/setup.typoscript diff --git a/pi1/class.tx_datamintsfeuser_pi1.php b/pi1/class.tx_datamintsfeuser_pi1.php index 6baf0dd..eea3a9e 100644 --- a/pi1/class.tx_datamintsfeuser_pi1.php +++ b/pi1/class.tx_datamintsfeuser_pi1.php @@ -3015,7 +3015,7 @@ public function determineConfiguration() { $flexConf = array(); // Extension Konfiguration ermitteln. - $this->extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][$this->extKey]); + $this->extConf = $GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS'][$this->extKey]; // Alle Tabs der Flexformkonfiguration durchgehn. if (is_array($this->cObj->data['pi_flexform']['data'])) { diff --git a/pi1/de.locallang.xlf b/pi1/de.locallang.xlf index be775be..dd1881c 100644 --- a/pi1/de.locallang.xlf +++ b/pi1/de.locallang.xlf @@ -293,4 +293,4 @@ - \ No newline at end of file + diff --git a/pi1/locallang.xlf b/pi1/locallang.xlf index 145724b..5dd7c0f 100644 --- a/pi1/locallang.xlf +++ b/pi1/locallang.xlf @@ -221,4 +221,4 @@ - \ No newline at end of file + From 3d8ec8b276f38b911717946c272acf60bd7bbc2c Mon Sep 17 00:00:00 2001 From: Benjamin Stiber Date: Thu, 16 Mar 2023 11:19:00 +0100 Subject: [PATCH 08/12] [FEATURE] add powermail as option for captcha --- README.md | 19 +++++++++++ pi1/class.tx_datamintsfeuser_pi1.php | 48 ++++++++++++++++++++++++++-- 2 files changed, 64 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6f5f47b..cd4ca94 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,22 @@ # EXT: datamints_feuser Online documentation: https://docs.typo3.org/typo3cms/extensions/datamints_feuser/ + +# Extended functionality +Captcha is now compatible with Powermail captcha + +To use you can adjust the typoscript config: + +``` +captcha.use = powermail +captcha.class = your classes +captcha.reload_class = your reload classes +captcha.reload_icon_path = your path to an image +form.class = your form class +``` + +If ```captcha.reload_class``` is set there will be a span rendered where you can attach your captcha reload magick to + +If ```captcha.reload_icon_path``` is set there, the image will be rendered + +To add a class to the form, you can set ```form.class``` diff --git a/pi1/class.tx_datamintsfeuser_pi1.php b/pi1/class.tx_datamintsfeuser_pi1.php index eea3a9e..1679489 100644 --- a/pi1/class.tx_datamintsfeuser_pi1.php +++ b/pi1/class.tx_datamintsfeuser_pi1.php @@ -23,6 +23,7 @@ * This copyright notice MUST APPEAR in all copies of the script! ***************************************************************/ +use In2code\Powermail\Domain\Model\Field; use TYPO3\CMS\Core\Utility\PathUtility; use TYPO3\CMS\Core\Utility\ArrayUtility; use TYPO3\CMS\Core\Utility\GeneralUtility; @@ -446,7 +447,7 @@ public function checkValid() { $captchaCheck = $this->checkCaptcha($value); if ($captchaCheck) { - $valueCheck[$fieldName] = $captchaCheck; + $valueCheck[$fieldName] = $captchaCheck; } } @@ -669,6 +670,17 @@ public function checkCaptcha($value) { switch ($this->conf['captcha.']['use']) { + case 'powermail': + $calculatingCaptchaService = GeneralUtility::makeInstance(\In2code\Powermail\Domain\Service\CalculatingCaptchaService::class); + + $field = new Field(); + $field->_setProperty('uid', $this->contentId); + if (!$calculatingCaptchaService->validCode($value, $field)) { + return self::validationerrorKeyValid; + } + + break; + case 'captcha': session_start(); @@ -1994,7 +2006,8 @@ public function showForm($valueCheck = array()) { $iInfoItem = 1; // Formular start. - $content = '
'; + $formClassName = $this->conf['form.']['class'] ?: ''; + $content = ''; $content .= '
'; // Wenn eine Lgende fuer das erste Fieldset definiert wurde, diese ausgeben. @@ -2651,6 +2664,32 @@ public function showCaptcha($fieldName, $valueCheck, $iItem) { switch ($this->conf['captcha.']['use']) { + case 'powermail': + $viewHelperInvoker = GeneralUtility::makeInstance(\TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperInvoker::class); + $renderingContext = GeneralUtility::makeInstance(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContext::class); + + $field = new Field(); + $field->_setProperty('uid', $this->contentId); + + $result = $viewHelperInvoker->invoke( + \In2code\Powermail\ViewHelpers\Validation\CaptchaViewHelper::class, + [ + 'field' => $field, + 'class' => $this->conf['captcha.']['class'] ?: '', + ], + $renderingContext, + ); + $captcha = $result; + if ($this->conf['captcha.']['reload_class']) { + $captcha .= ''; + if ($this->conf['captcha.']['reload_icon_path']) { + $captcha .= ''; + } + $captcha .= ''; + } + + break; + case 'captcha': $captcha = 'Captcha'; @@ -2694,8 +2733,11 @@ public function showCaptcha($fieldName, $valueCheck, $iItem) { $content .= '
'; $content .= ''; + if ($this->getLabel('captcha_info')) { + $content .= '
' . $this->getLabel('captcha_info') . '
'; + } $content .= '
' . $captcha . '
'; - $content .= ''; + $content .= ''; // $content .= ($showInput) ? '' : ''; $content .= $this->getErrorLabel($fieldName, $valueCheck); $content .= '
'; From 9735c5e20e3ac2f68bd25205f29005cf9a64dbb4 Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Thu, 16 Mar 2023 11:24:08 +0100 Subject: [PATCH 09/12] Update pi1/class.tx_datamintsfeuser_pi1.php --- pi1/class.tx_datamintsfeuser_pi1.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pi1/class.tx_datamintsfeuser_pi1.php b/pi1/class.tx_datamintsfeuser_pi1.php index 1679489..b37d128 100644 --- a/pi1/class.tx_datamintsfeuser_pi1.php +++ b/pi1/class.tx_datamintsfeuser_pi1.php @@ -447,7 +447,7 @@ public function checkValid() { $captchaCheck = $this->checkCaptcha($value); if ($captchaCheck) { - $valueCheck[$fieldName] = $captchaCheck; + $valueCheck[$fieldName] = $captchaCheck; } } From 1515a2ef0e8c5ab5950c4f6668747bb407236b09 Mon Sep 17 00:00:00 2001 From: Benjamin Stiber Date: Thu, 16 Mar 2023 11:30:53 +0100 Subject: [PATCH 10/12] [CLEANUP] add editorconfig and fix indents --- .editorconfig | 17 ++++++++ pi1/class.tx_datamintsfeuser_pi1.php | 64 ++++++++++++++-------------- 2 files changed, 49 insertions(+), 32 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..fae3f2c --- /dev/null +++ b/.editorconfig @@ -0,0 +1,17 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_size = 2 +indent_style = tab +insert_final_newline = true +max_line_length = 160 +# tab_width = 2 +ij_continuation_indent_size = 2 +ij_formatter_off_tag = @formatter:off +ij_formatter_on_tag = @formatter:on +ij_formatter_tags_enabled = false +ij_smart_tabs = false +ij_visual_guides = 120,160 +ij_wrap_on_typing = false diff --git a/pi1/class.tx_datamintsfeuser_pi1.php b/pi1/class.tx_datamintsfeuser_pi1.php index b37d128..70ba28e 100644 --- a/pi1/class.tx_datamintsfeuser_pi1.php +++ b/pi1/class.tx_datamintsfeuser_pi1.php @@ -670,16 +670,16 @@ public function checkCaptcha($value) { switch ($this->conf['captcha.']['use']) { - case 'powermail': - $calculatingCaptchaService = GeneralUtility::makeInstance(\In2code\Powermail\Domain\Service\CalculatingCaptchaService::class); + case 'powermail': + $calculatingCaptchaService = GeneralUtility::makeInstance(\In2code\Powermail\Domain\Service\CalculatingCaptchaService::class); - $field = new Field(); - $field->_setProperty('uid', $this->contentId); - if (!$calculatingCaptchaService->validCode($value, $field)) { - return self::validationerrorKeyValid; - } + $field = new Field(); + $field->_setProperty('uid', $this->contentId); + if (!$calculatingCaptchaService->validCode($value, $field)) { + return self::validationerrorKeyValid; + } - break; + break; case 'captcha': session_start(); @@ -2665,30 +2665,30 @@ public function showCaptcha($fieldName, $valueCheck, $iItem) { switch ($this->conf['captcha.']['use']) { case 'powermail': - $viewHelperInvoker = GeneralUtility::makeInstance(\TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperInvoker::class); - $renderingContext = GeneralUtility::makeInstance(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContext::class); - - $field = new Field(); - $field->_setProperty('uid', $this->contentId); - - $result = $viewHelperInvoker->invoke( - \In2code\Powermail\ViewHelpers\Validation\CaptchaViewHelper::class, - [ - 'field' => $field, - 'class' => $this->conf['captcha.']['class'] ?: '', - ], - $renderingContext, - ); - $captcha = $result; - if ($this->conf['captcha.']['reload_class']) { - $captcha .= ''; - if ($this->conf['captcha.']['reload_icon_path']) { - $captcha .= ''; - } - $captcha .= ''; - } + $viewHelperInvoker = GeneralUtility::makeInstance(\TYPO3Fluid\Fluid\Core\ViewHelper\ViewHelperInvoker::class); + $renderingContext = GeneralUtility::makeInstance(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContext::class); + + $field = new Field(); + $field->_setProperty('uid', $this->contentId); + + $result = $viewHelperInvoker->invoke( + \In2code\Powermail\ViewHelpers\Validation\CaptchaViewHelper::class, + [ + 'field' => $field, + 'class' => $this->conf['captcha.']['class'] ?: '', + ], + $renderingContext, + ); + $captcha = $result; + if ($this->conf['captcha.']['reload_class']) { + $captcha .= ''; + if ($this->conf['captcha.']['reload_icon_path']) { + $captcha .= ''; + } + $captcha .= ''; + } - break; + break; case 'captcha': $captcha = 'Captcha'; @@ -2734,7 +2734,7 @@ public function showCaptcha($fieldName, $valueCheck, $iItem) { $content .= '
'; $content .= ''; if ($this->getLabel('captcha_info')) { - $content .= '
' . $this->getLabel('captcha_info') . '
'; + $content .= '
' . $this->getLabel('captcha_info') . '
'; } $content .= '
' . $captcha . '
'; $content .= ''; From beadaa20723f6f6a6ac1d62e99d4d48562bc9ae9 Mon Sep 17 00:00:00 2001 From: Benjamin Stiber Date: Thu, 16 Mar 2023 12:18:36 +0100 Subject: [PATCH 11/12] [BUGFIX|FEATURE] get label from Flexform if it exists --- pi1/class.tx_datamintsfeuser_pi1.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pi1/class.tx_datamintsfeuser_pi1.php b/pi1/class.tx_datamintsfeuser_pi1.php index 70ba28e..795af30 100644 --- a/pi1/class.tx_datamintsfeuser_pi1.php +++ b/pi1/class.tx_datamintsfeuser_pi1.php @@ -2829,8 +2829,15 @@ public function getLabel($fieldName, $checkRequired = TRUE) { return $label . (($checkRequired) ? $this->isRequiredField($fieldName) : ''); } + //Label aus der Flexform holen + $label = $this->getFlexformLabelByFieldName($fieldName); + if ($label) { + return $label; + } + // LanguageString ermitteln. $languageString = $this->feUsersTca['columns'][$fieldName]['label']; + } else { $languageString = $fieldName; } @@ -2855,6 +2862,19 @@ public function getLabel($fieldName, $checkRequired = TRUE) { return $fieldName . (($checkRequired) ? $this->isRequiredField($fieldName) : ''); } + /** + * @param string $fieldName + * @return mixed|string + */ + public function getFlexformLabelByFieldName(string $fieldName) { + foreach($this->conf['databasefields'] as $databaseField) { + if ($databaseField['field'] === $fieldName) { + return $databaseField['label']; + } + } + return ''; + } + /** * Ermittelt den Fehlertyp aus dem Feldnamen. * From b2ac73aee3a48705b87c4bea88b6ba7359133dad Mon Sep 17 00:00:00 2001 From: Benjamin Stiber Date: Thu, 16 Mar 2023 13:58:49 +0100 Subject: [PATCH 12/12] adjust the way checkbox renders its label --- pi1/class.tx_datamintsfeuser_pi1.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pi1/class.tx_datamintsfeuser_pi1.php b/pi1/class.tx_datamintsfeuser_pi1.php index 795af30..14e3237 100644 --- a/pi1/class.tx_datamintsfeuser_pi1.php +++ b/pi1/class.tx_datamintsfeuser_pi1.php @@ -2030,8 +2030,11 @@ public function showForm($valueCheck = array()) { // Form Item Anfang. $content .= '
'; - // Label schreiben. - $content .= ''; + + if ($fieldConfig['type'] !== 'check') { + // Label schreiben. + $content .= ''; + } switch ($fieldConfig['type']) { @@ -2378,8 +2381,13 @@ public function showCheck($fieldName, $fieldConfig, $arrCurrentData, $disabledFi } else { $checked = ($arrCurrentData[$fieldName]) ? ' checked="checked"' : ''; + $content .= ''; + + } return $content;