Merge branch 'release/4.2.4'

in2code-de · Jan 24, 2019 · da6425b · da6425b
2 parents bd36aed + ccb8906
commit da6425b
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 13 deletions.
diff --git a/Classes/Domain/Repository/PluginRepository.php b/Classes/Domain/Repository/PluginRepository.php
@@ -35,7 +35,7 @@ public function getControllerNameByPluginSettings(int $contentIdentifier): strin
             ->where('uid=' . (int)$contentIdentifier)
             ->execute()
             ->fetchColumn(0);
-        return $this->getViewFromFlexForm($flexForm);
+        return $this->getViewFromFlexForm((string)$flexForm);
     }
 
     /**
@@ -49,11 +49,11 @@ public function isPluginWithViewOnGivenPage(string $view, int $pageIdentifier):
         $pluginConfigurations = $queryBuilder
             ->select('pi_flexform')
             ->from(self::TABLE_NAME)
-            ->where('pid=' . (int)$pageIdentifier)
+            ->where('pid=' . (int)$pageIdentifier . ' and list_type="femanager_pi1" and CType="list"')
             ->execute()
             ->fetchAll();
         foreach ($pluginConfigurations as $pluginConfiguration) {
-            if ($this->isViewInPluginConfiguration($view, $pluginConfiguration['pi_flexform'])) {
+            if ($this->isViewInPluginConfiguration($view, (string)$pluginConfiguration['pi_flexform'])) {
                 return true;
             }
         }

diff --git a/Documentation/Features/Index.rst b/Documentation/Features/Index.rst
@@ -19,4 +19,4 @@ See some features or best practice parts of the extension femanager.
 	AutoConfirmation/Index
 	Finishers/Index
 	Signals/Index
-   ResendUserConfirmationRequest/Index
+	ResendUserConfirmationRequest/Index
diff --git a/Documentation/Features/Signals/Index.rst b/Documentation/Features/Signals/Index.rst
@@ -266,7 +266,7 @@ This is an example how to use a signal from femanager – in this case we decide
 
 	<?php
 
-	$signalSlotDispatcher = t3lib_div::makeInstance('TYPO3\\CMS\\Extbase\\SignalSlot\\Dispatcher');
+	$signalSlotDispatcher = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Extbase\\SignalSlot\\Dispatcher');
 	$signalSlotDispatcher->connect(
 		'In2code\Femanager\Controller\NewController',
 		'createActionBeforePersist',

diff --git a/Resources/Private/JavaScript/Validation.js b/Resources/Private/JavaScript/Validation.js
@@ -157,6 +157,8 @@ jQuery.fn.femanagerValidation = function($) {
 		var nameParts = element.prop('name').split('[');
 		if (nameParts[2] !== undefined) {
 			name = nameParts[2].replace(']', '');
+		} else {
+			name = nameParts[1].replace(']', '');
 		}
 		return name;
 	}

diff --git a/Resources/Public/Icons/Extension.svg b/Resources/Public/Icons/Extension.svg
diff --git a/Resources/Public/JavaScript/Validation.min.js b/Resources/Public/JavaScript/Validation.min.js
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -23,7 +23,7 @@
     'modify_tables' => '',
     'clearCacheOnLoad' => 0,
     'lockType' => '',
-    'version' => '4.2.3',
+    'version' => '4.2.4',
     'constraints' => [
         'depends' => [
             'typo3' => '8.7.0-8.7.99',

diff --git a/ext_tables.php b/ext_tables.php
@@ -25,7 +25,7 @@
             ],
             [
                 'access' => 'user,group',
-                'icon' => 'EXT:femanager/ext_icon.svg',
+                'icon' => 'EXT:femanager/Resources/Public/Icons/Extension.svg',
                 'labels' => 'LLL:EXT:femanager/Resources/Private/Language/locallang_mod.xlf',
             ]
         );

diff --git a/readme.md b/readme.md
@@ -21,16 +21,20 @@ Quick guide:
 
 | Femanager   | TYPO3      | PHP       | Support/Development                     |
 | ----------- | ---------- | ----------|---------------------------------------- |
-| 4.x         | 8.7        | 7.0 - 7.2 | Features, Bugfixes, Security Updates    |
-| 3.x         | 8.7        | 7.0 - 7.2 | Security Updates                        |
-| 2.x         | 7.6        | 5.5 - 7.0 | Security Updates                        |
-| 1.x         | 6.2 - 7.6  | 5.5 - 7.0 | Security Updates                        |
+| 5.x         | 8.7 - 9.5  | 7.2 - 7.3 | In Development - Features, Bugfixes, Security Updates|
+| 4.x         | 8.7        | 7.0 - 7.2 | Security Updates|
+| 3.x         | 8.7        | 7.0 - 7.2 | Security Updates on demand (ask for an offer)|
+| 2.x         | 7.6        | 5.5 - 7.0 | Security Updates on demand (ask for an offer)|
+| 1.x         | 6.2 - 7.6  | 5.5 - 7.0 | Security Updates on demand (ask for an offer)|
+
+Offical support (fee-based) via https://www.in2code.de/kontakt 
 
 ## Changelog
 
 | Version    | Date       | State        | Description                                                                                                                |
 | ---------- | ---------- | ------------ | -------------------------------------------------------------------------------------------------------------------------- |
-| 4.2.3      | 2019-01-22 | Security     | Don't allow a complete bypass of the validation
+| 4.2.4      | 2019-01-24 | Bugfix       | Validation failed, if more then one content element was besides femanager plugin |
+| 4.2.3      | 2019-01-22 | Security     | Don't allow a complete bypass of the validation|
 | 4.2.2      | 2018-05-11 | Bugfix       | Allow filtering in OpenConfirmationView (BE), Fix case sensitive filename for OpenConfirmationView, Support TYPO3 CMS Subtree packages, update documentaion |
 | 4.2.1      | 2018-05-04 | Task         | Update documenation, fix broken custom validators, enable TS for BE Module, check if admin receive is not empty            |
 | 4.2.0      | 2018-04-24 | Task         | Allow to resend confirmation mail via Backend or Frontend - sponsored by Constructiva Solutions GmbH and in2code GmbH      |