[+BUGFIX] Parse template in TCA works now with rootpage on level > 0. Thanks to Chris...

[+TASK] Updated version and ChangeLog.

git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/contagged/trunk@41194 735d13b6-9817-0410-8766-e36946ffe9aa

diff --git a/ChangeLog b/ChangeLog
index 8f7bb18..37dd649 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+v1.6.5 2010-12-15 Jochen Rau <jochen.rau@typoplanet.de>
+
+       [+BUGFIX] Parse template in TCA works now with rootpage on level > 0. Thanks to Christopher Hlubek. Resolves #11454.
+       [+FEATURE] You can now specify the maximum number of recurrences per page by maxRecurrencesPerPage option. It can be combined with the maxRecurrences (per cObj) option. Thanks to Felix Oertel. Resolves #10973.
+       [+FEATURE] Implemented reference, pronounciation, and media property. The reference property is a textual representation of the term source. The media property can store a reference to video and sound files. See the cObj MULTIMEDIA for documentation.
+
 v1.6.4 2010-10-06 Jochen Rau <jochen.rau@typoplanet.de>
 
        [+BUGFIX] Reverted a change that led to a non-functional control flow. Thanks to Fatoux Sébastien. Resolves #6743.
@@ -324,4 +330,4 @@ v0.0.1 2007-05-16 Jochen Rau <jochen.rau@typoplanet.de>
 
 v0.0.0 2007-05-14 Jochen Rau <jochen.rau@typoplanet.de>
 
-       * Initial release
+       * Initial release
\ No newline at end of file

diff --git a/ext_emconf.php b/ext_emconf.php
index 10cbecd..9620318 100644 (file)
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -15,7 +15,7 @@ $EM_CONF[$_EXTKEY] = array(
        'description' => 'This extension parses your content to tag, replace and link specific terms. It is useful to auto-generate a glossary - but not only. See \'ChangeLog\' and WiKi (\'http://wiki.typo3.org/index.php/Contagged\').',
        'category' => 'fe',
        'shy' => 0,
-       'version' => '1.6.4',
+       'version' => '1.6.5',
        'dependencies' => '',
        'conflicts' => '',
        'priority' => '',

diff --git a/model/class.tx_contagged_model_terms.php b/model/class.tx_contagged_model_terms.php
index b6efa3e..6cd2ae1 100644 (file)
--- a/model/class.tx_contagged_model_terms.php
+++ b/model/class.tx_contagged_model_terms.php
@@ -1,26 +1,26 @@
 <?php
 /***************************************************************
-       *  Copyright notice
-       *
-       *  (c) 2007 Jochen Rau <j.rau@web.de>
-       *  All rights reserved
-       *
-       *  This script is part of the TYPO3 project. The TYPO3 project is
-       *  free software; you can redistribute it and/or modify
-       *  it under the terms of the GNU General Public License as published by
-       *  the Free Software Foundation; either version 2 of the License, or
-       *  (at your option) any later version.
-       *
-       *  The GNU General Public License can be found at
-       *  http://www.gnu.org/copyleft/gpl.html.
-       *
-       *  This script is distributed in the hope that it will be useful,
-       *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-       *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-       *  GNU General Public License for more details.
-       *
-       *  This copyright notice MUST APPEAR in all copies of the script!
-       ***************************************************************/
+ *  Copyright notice
+ *
+ *  (c) 2007 Jochen Rau <j.rau@web.de>
+ *  All rights reserved
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 require_once (t3lib_extMgm::extPath('contagged') . 'model/class.tx_contagged_model_mapper.php');
 
 /**
@@ -50,7 +50,7 @@ class tx_contagged_model_terms implements t3lib_Singleton {
 
                // build an array of tables in the database
                $this->tablesArray = $GLOBALS['TYPO3_DB']->admin_get_tables(TYPO3_db);
-               
+
                if (is_array($this->conf['dataSources.'])) {
                        foreach ($this->conf['dataSources.'] as $dataSource => $sourceConfiguration) {
                                $this->configuredSources[$sourceConfiguration['sourceName']] = substr($dataSource, 0, -1);
@@ -58,7 +58,7 @@ class tx_contagged_model_terms implements t3lib_Singleton {
                } else {
                        throw new RuntimeException('No configuration. Please include the static template.');
                }
-               
+
                $typesArray = $this->conf['types.'];
                foreach ($typesArray as $type=>$typeConfigArray) {
                        $storagePidsArray = $this->getStoragePidsArray($typeConfigArray);
@@ -67,7 +67,7 @@ class tx_contagged_model_terms implements t3lib_Singleton {
                                // if there is an entry for the data source: check for duplicates before adding the pid
                                // otherwise: create a new entry and add the pid
                                if ($this->dataSourceArray[$dataSource]) {
-                                       if ( !in_array($pid,$dataSourceArray[$dataSource]) ) {
+                                       if ( !in_array($pid,$this->dataSourceArray[$dataSource]) ) {
                                                $this->dataSourceArray[$dataSource][] = intval($pid);
                                        }
                                } else {
@@ -75,7 +75,7 @@ class tx_contagged_model_terms implements t3lib_Singleton {
                                }
                        }
                }
-               
+
        }
 
        function findAllTerms($additionalWhereClause = '') {
@@ -86,7 +86,7 @@ class tx_contagged_model_terms implements t3lib_Singleton {
                }
                return $this->terms;
        }
-       
+
        function findAllTermsToListOnPage($pid = NULL) {
                $terms = $this->findAllTerms(' AND exclude=0');
                if ($pid === NULL) $pid = $GLOBALS['TSFE']->id;
@@ -105,7 +105,7 @@ class tx_contagged_model_terms implements t3lib_Singleton {
        function sortByTermAscending($termArrayA, $termArrayB) {
                return strnatcasecmp($termArrayA['term'], $termArrayB['term']);
        }
-       
+
        function findTermByUid($dataSource, $uid) {
                $additionalWhereClause = ' AND uid=' . intval($uid);
                $terms = $this->fetchTermsFromSource($dataSource, $storagePidsArray, $additionalWhereClause);
@@ -142,7 +142,7 @@ class tx_contagged_model_terms implements t3lib_Singleton {
                                '*', // SELECT ...
                                $tableName, // FROM ...
                                $whereClause // WHERE ..
-                               );
+                       );
                        // map the fields
                        $mappedResult = $this->mapper->getDataArray($result,$dataSource);
                }
@@ -154,7 +154,7 @@ class tx_contagged_model_terms implements t3lib_Singleton {
                // TODO piVars as a data source
                return $dataArray;
        }
-       
+
        function fetchRelatedTerms(&$dataArray) {
                $newDataArray = array();
                foreach ($dataArray as $key => $termArray) {
@@ -163,7 +163,7 @@ class tx_contagged_model_terms implements t3lib_Singleton {
                                'tx_contagged_related_mm', // FROM ...
                                'uid_local=' . $termArray['uid'], // WHERE ..
                                'sorting'
-                               );
+                       );
 
                        if (!empty($result)) {
                                $termArray['related'] = array();

diff --git a/tca.php b/tca.php
index e75e724..b8eb0aa 100644 (file)
--- a/tca.php
+++ b/tca.php
@@ -326,7 +326,14 @@ function user_addTermTypes(&$params,&$pObj) {
        $template->init();
        $sysPage = t3lib_div::makeInstance('t3lib_pageSelect');
        $rootline = $sysPage->getRootLine(getCurrentPageId());
-       $template->runThroughTemplates($rootline, 0);
+       $rootlineIndex = 0;
+       foreach ($rootline as $index => $rootlinePart) {
+               if ($rootlinePart['is_siteroot'] == 1) {
+                       $rootlineIndex = $index;
+                       break;
+               }
+       }
+       $template->runThroughTemplates($rootline, $rootlineIndex);
        $template->generateConfig();
        $conf = $template->setup['plugin.']['tx_contagged.'];