[BUG] Generating with CONTENT, it get the content double

ChangeLog

@@ -1,3 +1,5 @@
+7.1.0 > See https://forge.typo3.org/projects/extension-gridelements2/repository/show?rev=7-0
+
 7.0.5 > 2016-01-29 Jo Hasenau <info@cybercraft.de>
 	Done: Task #60220 Escaped variables in SQL queries
 	Added: Feature #47294 Make PAGE_TSCONFIG_ID aware of CSV lists of IDs

Classes/Backend/ClickMenuOptions.php

@@ -37,7 +37,6 @@
  */
 class ClickMenuOptions implements SingletonInterface
 {
-
     /**
      * @var LanguageService
      */
@@ -51,41 +50,36 @@ class ClickMenuOptions implements SingletonInterface
     /**
      * Main method
      *
-     * @param CLickMenu $backRef
+     * @param ClickMenu $backRef
      * @param array $menuItems
      * @param string $table
      * @param int $uid
      *
      * @return array
      */
-    public function main($backRef, array $menuItems, $table = '', $uid = 0)
+    public function main(ClickMenu $backRef, array $menuItems, $table = '', $uid = 0)
     {
+        if ($table !== 'tt_content') {
+            return $menuItems;
+        }
 
-        if ($table === 'tt_content') {
-            $this->setLanguageService($GLOBALS['LANG']);
+        $this->setLanguageService($GLOBALS['LANG']);
 
-            // add "paste reference after" if user is allowed to use CType shortcut
-            if ($this->getBackendUser()->checkAuthMode('tt_content', 'CType', 'shortcut', $GLOBALS['TYPO3_CONF_VARS']['BE']['explicitADmode'])) {
-                if ($menuItems['pasteafter']) {
-                    unset($menuItems['pasteafter']);
-                    $selItem = $backRef->clipObj->getSelectedRecord();
-                    $targetItem = BackendUtility::getRecordRaw('tt_content', 'uid = ' . $uid,
-                        'colPos,tx_gridelements_container,tx_gridelements_columns');
-                    $elInfo = array(
-                        GeneralUtility::fixed_lgd_cs($selItem['_RECORD_TITLE'],
-                            $this->getBackendUser()->uc['titleLen']),
-                        $backRef->root ? $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] : GeneralUtility::fixed_lgd_cs(BackendUtility::getRecordTitle($table,
-                            $backRef->rec), $this->getBackendUser()->uc['titleLen']),
-                        $backRef->clipObj->currentMode()
-                    );
-                    $menuItems['pasteafter'] = $this->DB_paste($backRef, $table, -$uid, 'after', $elInfo, $targetItem,
-                        false);
-                    if ($backRef->clipObj->currentMode() === 'copy') {
-                        $menuItems['pastereference'] = $this->DB_paste($backRef, $table, -$uid, 'after', $elInfo,
-                            $targetItem, true);
-                    }
-                }
+        // add "paste reference after" if user is allowed to use CType shortcut
+        if ($menuItems['pasteafter'] && $this->getBackendUser()->checkAuthMode('tt_content', 'CType', 'shortcut', $GLOBALS['TYPO3_CONF_VARS']['BE']['explicitADmode'])) {
+            unset($menuItems['pasteafter']);
+            $selItem = $backRef->clipObj->getSelectedRecord();
+            $targetItem = BackendUtility::getRecordRaw('tt_content', 'uid = ' . $uid, 'colPos,tx_gridelements_container,tx_gridelements_columns');
+            $elInfo = array(
+                GeneralUtility::fixed_lgd_cs($selItem['_RECORD_TITLE'], $this->getBackendUser()->uc['titleLen']),
+                GeneralUtility::fixed_lgd_cs(BackendUtility::getRecordTitle($table, $backRef->rec), $this->getBackendUser()->uc['titleLen']),
+                $backRef->clipObj->currentMode()
+            );
+            $menuItems['pasteafter'] = $this->DB_paste($backRef, $table, -$uid, 'after', $elInfo, $targetItem, false);
+            if ($backRef->clipObj->currentMode() === 'copy') {
+                $menuItems['pastereference'] = $this->DB_paste($backRef, $table, -$uid, 'after', $elInfo, $targetItem, true);
             }
+
         }
 
         return $menuItems;
@@ -95,42 +89,49 @@ public function main($backRef, array $menuItems, $table = '', $uid = 0)
      * Adding CM element for Clipboard "paste into"/"paste after"
      * NOTICE: $table and $uid should follow the special syntax for paste, see clipboard-class :: pasteUrl();
      *
-     * @param CLickMenu $backRef
+     * @param ClickMenu $backRef
      * @param string $table Table name
      * @param int $uid UID for the current record. NOTICE: Special syntax!
-     * @param string $type Type: "into" or "after
+     * @param string $type Type "into" or "after
      * @param array $elInfo Contains instructions about whether to copy or cut an element.
      * @param array $targetItem
      * @param bool $reference
      *
      * @return array Item array, element in $menuItems
      */
-    public function DB_paste(&$backRef, $table, $uid, $type, $elInfo, $targetItem, $reference)
+    public function DB_paste(ClickMenu $backRef, $table, $uid, $type, array $elInfo, array  $targetItem, $reference)
     {
         $this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
         $updateArray = array(
             'colPos' => $targetItem['colPos'],
-            'tx_gridelements_container' => $targetItem['tx_gridelements_container'],
-            'tx_gridelements_columns' => $targetItem['tx_gridelements_columns']
+            'tx_gridelements_container' => (int)$targetItem['tx_gridelements_container'],
+            'tx_gridelements_columns' => (int)$targetItem['tx_gridelements_columns']
         );
         $loc = 'top.content.list_frame';
         if ($this->getBackendUser()->jsConfirmation(JsConfirmation::COPY_MOVE_PASTE)) {
-            $conf = $loc . ' && confirm(' . GeneralUtility::quoteJSvalue(sprintf($this->getLanguageService()->sL(('LLL:EXT:lang/locallang_core.xlf:mess.' . ($elInfo[2] === 'copy' ? 'copy' : 'move') . '_' . $type)),
-                    $elInfo[0], $elInfo[1])) . ')';
+            $conf = $loc . ' && confirm(' . GeneralUtility::quoteJSvalue(
+                sprintf($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:mess.' . ($elInfo[2] === 'copy' ? 'copy' : 'move') . '_' . $type), $elInfo[0], $elInfo[1])
+                ) . ')';
         } else {
             $conf = $loc;
         }
-        $editOnClick = 'if(' . $conf . '){' . $loc . '.location.href=' . GeneralUtility::quoteJSvalue($backRef->clipObj->pasteUrl($table,
-                    $uid, 0,
-                    $updateArray) . ($reference ? '&reference=1' : '') . '&redirect=') . '+top.rawurlencode(' . $backRef->frameLocation(($loc . '.document')) . '.pathname+' . $backRef->frameLocation(($loc . '.document')) . '.search);}';
+        $editOnClick = 'if(' . $conf . '){' . $loc . '.location.href='
+                       . GeneralUtility::quoteJSvalue($backRef->clipObj->pasteUrl($table, $uid, 0, $updateArray)
+                       . ($reference ? '&reference=1' : '') . '&redirect=') . '+top.rawurlencode('
+                       . $backRef->frameLocation(($loc . '.document')) . '.pathname+'
+                       . $backRef->frameLocation(($loc . '.document')) . '.search);}';
 
-        return $backRef->linkItem($reference ? $this->getLanguageService()->sL('LLL:EXT:gridelements/Resources/Private/Language/locallang_db.xml:tx_gridelements_clickmenu_pastereference') : $backRef->label('paste' . $type),
+        return $backRef->linkItem(
+            $reference
+                ? $this->getLanguageService()->sL('LLL:EXT:gridelements/Resources/Private/Language/locallang_db.xml:tx_gridelements_ClickMenu_pastereference')
+                : $backRef->label('paste' . $type),
             $this->iconFactory->getIcon('actions-document-paste-' . $type, Icon::SIZE_SMALL)->render(),
-            $editOnClick . 'return false;');
+            $editOnClick . 'return false;'
+        );
     }
 
     /**
-     * Gets the current backend user.
+     * Gets the current backend user
      *
      * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
      */
@@ -153,12 +154,9 @@ public function getLanguageService()
      * setter for databaseConnection object
      *
      * @param LanguageService $languageService
-     *
-     * @return void
      */
     public function setLanguageService(LanguageService $languageService)
     {
         $this->languageService = $languageService;
     }
-
 }

Classes/Backend/ItemsProcFuncs/AbstractItemsProcFunc.php

@@ -20,11 +20,11 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
+use GridElementsTeam\Gridelements\Helper\Helper;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Database\DatabaseConnection;
 use TYPO3\CMS\Core\Database\QueryGenerator;
 use TYPO3\CMS\Core\SingletonInterface;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Lang\LanguageService;
 
 /**
@@ -36,7 +36,6 @@
  */
 abstract class AbstractItemsProcFunc implements SingletonInterface
 {
-
     /**
      * @var DatabaseConnection
      */
@@ -52,11 +51,6 @@ abstract class AbstractItemsProcFunc implements SingletonInterface
      */
     protected $tree;
 
-    /**
-     * @var string
-     */
-    protected $backPath = '';
-
     /**
      * initializes this class
      *
@@ -71,38 +65,19 @@ public function init($pageUid = 0)
     /**
      * Gets the selected backend layout
      *
-     * @param int $id : The uid of the page we are currently working on
+     * @param int $id The uid of the page we are currently working on
      *
-     * @return array|null $backendLayout : An array containing the data of the selected backend layout as well as a parsed version of the layout configuration
+     * @return array|null An array containing the data of the selected backend layout as well as a parsed version of the layout configuration
      */
     public function getSelectedBackendLayout($id)
     {
-        $backendLayoutData = GeneralUtility::callUserFunction('TYPO3\\CMS\\Backend\\View\\BackendLayoutView->getSelectedBackendLayout',
-            $id, $this);
-        // add allowed CTypes to the columns, since this is not done by the native core methods
-        if (count($backendLayoutData['__items']) > 0) {
-            if (!empty($backendLayoutData['__config']['backend_layout.']['rows.'])) {
-                foreach ($backendLayoutData['__config']['backend_layout.']['rows.'] as $row) {
-                    if (!empty($row['columns.'])) {
-                        foreach ($row['columns.'] as $column) {
-                            $backendLayoutData['columns'][$column['colPos']] = $column['allowed'] ? $column['allowed'] : '*';
-                            $backendLayoutData['columns']['allowed'] .= $backendLayoutData['columns']['allowed'] ? ',' . $backendLayoutData['columns'][$column['colPos']] : $backendLayoutData['columns'][$column['colPos']];
-                        }
-                    }
-                }
-            }
-            foreach ($backendLayoutData['__items'] as $key => $item) {
-                $backendLayoutData['__items'][$key][3] = $backendLayoutData['columns'][$item[1]];
-            }
-        };
-
-        return $backendLayoutData;
+        return Helper::getInstance()->getSelectedBackendLayout($id);
     }
 
     /**
      * This method is a wrapper for unitTests because of the static method
      *
-     * @param $pageUid
+     * @param int $pageUid
      *
      * @return array
      */

Classes/Backend/ItemsProcFuncs/CTypeList.php

@@ -20,7 +20,7 @@
  ***************************************************************/
 
 use GridElementsTeam\Gridelements\Backend\LayoutSetup;
-use GridElementsTeam\Gridelements\Helper\Helper;
+use TYPO3\CMS\Core\Database\DatabaseConnection;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
@@ -46,84 +46,72 @@ class CTypeList extends AbstractItemsProcFunc
     /**
      * injects layout setup
      *
-     * @param \GridElementsTeam\Gridelements\Backend\LayoutSetup $layoutSetup
+     * @param LayoutSetup $layoutSetup
      */
     public function injectLayoutSetup(LayoutSetup $layoutSetup)
     {
         $this->layoutSetup = $layoutSetup;
     }
 
     /**
-     * ItemProcFunc for CType items
+     * initializes this class
      *
-     * @param array $params : The array of parameters that is used to render the item list
+     * @param int $pageUid
+     */
+    public function init($pageUid = 0)
+    {
+        parent::init();
+        if (!$this->layoutSetup) {
+            $this->injectLayoutSetup(GeneralUtility::makeInstance(LayoutSetup::class)->init($pageUid));
+        }
+    }
+
+    /**
+     * ItemProcFunc for CType items
      *
-     * @return void
+     * @param array $params The array of parameters that is used to render the item list
      */
-    public function itemsProcFunc(&$params)
+    public function itemsProcFunc(array &$params)
     {
         if ((int)$params['row']['pid'] > 0) {
-            $this->checkForAllowedCTypes($params['items'], $params['row']['pid'], $params['row']['colPos'],
-                $params['row']['tx_gridelements_container'], $params['row']['tx_gridelements_columns']);
+            $this->checkForAllowedCTypes($params['items'], $params['row']['pid'], $params['row']['colPos'], $params['row']['tx_gridelements_container'], $params['row']['tx_gridelements_columns']);
         } else {
             $this->init((int)$params['row']['pid']);
             // negative uid_pid values indicate that the element has been inserted after an existing element
             // so there is no pid to get the backendLayout for and we have to get that first
-            $existingElement = $this->databaseConnection->exec_SELECTgetSingleRow('pid, CType, colPos, tx_gridelements_container, tx_gridelements_columns',
-                'tt_content', 'uid=' . -((int)$params['row']['pid']));
+            $existingElement = $this->databaseConnection->exec_SELECTgetSingleRow('pid, CType, colPos, tx_gridelements_container, tx_gridelements_columns', 'tt_content', 'uid=' . -((int)$params['row']['pid']));
             if ((int)$existingElement['pid'] > 0) {
-                $this->checkForAllowedCTypes($params['items'], $existingElement['pid'], $existingElement['colPos'],
-                    $existingElement['tx_gridelements_container'], $existingElement['tx_gridelements_columns']);
+                $this->checkForAllowedCTypes($params['items'], $existingElement['pid'], $existingElement['colPos'], $existingElement['tx_gridelements_container'], $existingElement['tx_gridelements_columns']);
             }
         }
     }
 
     /**
      * Checks if a CType is allowed in this particular page or grid column - only this one column defines the allowed CTypes regardless of any parent column
      *
-     * @param array $items : The items of the current CType list
-     * @param integer $pid : The id of the page we are currhently working on
-     * @param integer $pageColumn : The page column the element is a child of
-     * @param integer $gridContainerId : The ID of the current container
-     * @param integer $gridColumn : The grid column the element is a child of
-     *
-     * @return array|null $backendLayout: An array containing the data of the selected backend layout as well as a parsed version of the layout configuration
+     * @param array $items The items of the current CType list
+     * @param int $pid The id of the page we are currently working on
+     * @param int $pageColumn The page column the element is a child of
+     * @param int $gridContainerId The ID of the current container
+     * @param int $gridColumn The grid column the element is a child of
      */
-    public function checkForAllowedCTypes(&$items, $pid, $pageColumn, $gridContainerId, $gridColumn)
+    public function checkForAllowedCTypes(array &$items, $pid, $pageColumn, $gridContainerId, $gridColumn)
     {
         if ((int)$pageColumn >= 0 || (int)$pageColumn === -2) {
             $column = $pageColumn ? $pageColumn : 0;
             $backendLayout = $this->getSelectedBackendLayout($pid);
         } else {
             $this->init($pid);
-            $column = $gridColumn ? $gridColumn : 0;
+            $column = $gridColumn ? (int)$gridColumn : 0;
             $gridElement = $this->layoutSetup->cacheCurrentParent($gridContainerId, true);
             $backendLayout = $this->layoutSetup->getLayoutSetup($gridElement['tx_gridelements_backend_layout']);
         }
         if (isset($backendLayout)) {
             foreach ($items as $key => $item) {
-                if (!(GeneralUtility::inList($backendLayout['columns'][$column],
-                        $item[1]) || GeneralUtility::inList($backendLayout['columns'][$column], '*'))
-                ) {
+                if (!GeneralUtility::inList($backendLayout['columns'][$column], $item[1]) && !GeneralUtility::inList($backendLayout['columns'][$column], '*')) {
                     unset($items[$key]);
                 }
             }
         }
     }
-
-    /**
-     * initializes this class
-     *
-     * @param int $pageUid
-     */
-    public function init($pageUid = 0)
-    {
-        parent::init();
-        if (!$this->layoutSetup instanceof LayoutSetup) {
-            if ($pageUid < 0) {
-                $pageUid = Helper::getInstance()->getPidFromNegativeUid($pageUid);
-            }
-            $this->injectLayoutSetup(GeneralUtility::makeInstance(LayoutSetup::class)->init($pageUid));
-        }
-    }
 }