[BUGFIX] stdWrap numRows fails due to wrong SELECT clause

Exclude aggregate functions count(), sum(), max(),
min(), avg() in if statement inside
tslib_cObj::sanitizeSelectPart().

Change-Id: I5d8cd5f00472b417dad3c8790b1cc75f3cfd473a
Fixes: #34152
Releases: 4.5, 4.6, 4.7, 6.0
Reviewed-on: http://review.typo3.org/9158
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
Reviewed-by: Alain
Tested-by: Alain
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
Reviewed-by: Stefan Neufeind
Reviewed-by: Ernesto Baschny
Tested-by: Ernesto Baschny

diff --git a/typo3/sysext/cms/tests/tslib/class.tslib_contentTest.php b/typo3/sysext/cms/tests/tslib/class.tslib_contentTest.php
index d92d43a..8373ea3 100644 (file)
--- a/typo3/sysext/cms/tests/tslib/class.tslib_contentTest.php
+++ b/typo3/sysext/cms/tests/tslib/class.tslib_contentTest.php
@@ -71,6 +71,8 @@ class tslib_contentTest extends tx_phpunit_testcase {
                $this->tsfe = $this->getMock('tslib_fe', array(), array(), '', FALSE);
                $this->tsfe->tmpl = $this->template;
                $this->tsfe->config = array();
+               $sysPageMock = $this->getMock('t3lib_pageSelect');
+               $this->tsfe->sys_page = $sysPageMock;
                $GLOBALS['TSFE'] = $this->tsfe;
                $GLOBALS['TSFE']->csConvObj = new t3lib_cs();
                $GLOBALS['TSFE']->renderCharset = 'utf-8';
@@ -918,5 +920,124 @@ class tslib_contentTest extends tx_phpunit_testcase {
                $result = $this->cObj->stdWrap_replacement($input, $conf);
                $this->assertEquals($expected, $result);
        }
+
+       /**
+        * Data provider for the getQuery test
+        *
+        * @return array multi-dimensional array with the second level like this:
+        *               0 => the $table
+        *               1 => the $conf
+        *               2 => the part to test for validity (sub-array of the result)
+        *
+        * @see getQuery
+        */
+       public function getQueryDataProvider() {
+               $data = array(
+                       'testing empty conf' => array(
+                               'tt_content',
+                               array(),
+                               array(
+                                       'SELECT' => '*',
+                               )
+                       ),
+                       'testing #17284: adding uid/pid for workspaces' => array(
+                               'tt_content',
+                               array(
+                                       'selectFields' => 'header,bodytext',
+                               ),
+                               array(
+                                       'SELECT' => 'header,bodytext, tt_content.uid as uid, tt_content.pid as pid, tt_content.t3ver_state as t3ver_state',
+                               )
+                       ),
+                       'testing #17284: no need to add' => array(
+                               'tt_content',
+                               array(
+                                       'selectFields' => 'tt_content.*',
+                               ),
+                               array(
+                                       'SELECT' => 'tt_content.*',
+                               )
+                       ),
+                       'testing #17284: no need to add #2' => array(
+                               'tt_content',
+                               array(
+                                       'selectFields' => '*',
+                               ),
+                               array(
+                                       'SELECT' => '*',
+                               )
+                       ),
+                       'testing #29783: joined tables, prefix tablename' => array(
+                               'tt_content',
+                               array(
+                                       'selectFields' => 'tt_content.header,be_users.username',
+                                       'join' => 'be_users ON tt_content.cruser_id = be_users.uid',
+                               ),
+                               array(
+                                       'SELECT' => 'tt_content.header,be_users.username, tt_content.uid as uid, tt_content.pid as pid, tt_content.t3ver_state as t3ver_state',
+                               )
+                       ),
+                       'testing #34152: single count(*), add nothing' => array(
+                               'tt_content',
+                               array(
+                                       'selectFields' => 'count(*)',
+                               ),
+                               array(
+                                       'SELECT' => 'count(*)',
+                               )
+                       ),
+                       'testing #34152: single max(crdate), add nothing' => array(
+                               'tt_content',
+                               array(
+                                       'selectFields' => 'max(crdate)',
+                               ),
+                               array(
+                                       'SELECT' => 'max(crdate)',
+                               )
+                       ),
+                       'testing #34152: single min(crdate), add nothing' => array(
+                               'tt_content',
+                               array(
+                                       'selectFields' => 'min(crdate)',
+                               ),
+                               array(
+                                       'SELECT' => 'min(crdate)',
+                               )
+                       ),
+                       'testing #34152: single sum(is_siteroot), add nothing' => array(
+                               'tt_content',
+                               array(
+                                       'selectFields' => 'sum(is_siteroot)',
+                               ),
+                               array(
+                                       'SELECT' => 'sum(is_siteroot)',
+                               )
+                       ),
+                       'testing #34152: single avg(crdate), add nothing' => array(
+                               'tt_content',
+                               array(
+                                       'selectFields' => 'avg(crdate)',
+                               ),
+                               array(
+                                       'SELECT' => 'avg(crdate)',
+                               )
+                       ),
+               );
+               return $data;
+       }
+
+       /**
+        * Check if sanitizeSelectPart works as expected
+        *
+        * @dataProvider getQueryDataProvider
+        *
+        * @test
+        */
+       public function getQuery($table, $conf, $expected) {
+               $result = $this->cObj->getQuery($table, $conf, TRUE);
+               foreach ($expected as $field => $value) {
+                       $this->assertEquals($value, $result[$field]);
+               }
+       }
 }
 ?>
\ No newline at end of file

diff --git a/typo3/sysext/cms/tslib/class.tslib_content.php b/typo3/sysext/cms/tslib/class.tslib_content.php
index f9cc646..593672b 100644 (file)
--- a/typo3/sysext/cms/tslib/class.tslib_content.php
+++ b/typo3/sysext/cms/tslib/class.tslib_content.php
@@ -7940,7 +7940,9 @@ class tslib_cObj {
                $necessaryFields = array('uid', 'pid');
                $wsFields = array('t3ver_state');
 
-               if (isset($GLOBALS['TCA'][$table]) && strpos($selectPart, '*')!== FALSE) {
+               if (isset($GLOBALS['TCA'][$table])
+                       && !preg_match($matchStart . '\*' . $matchEnd, $selectPart)
+                       && !preg_match('/(count|max|min|avg|sum)\([^\)]+\)/i', $selectPart)) {
                        foreach ($necessaryFields as $field) {
                                $match = $matchStart . $field . $matchEnd;
                                if (!preg_match($match, $selectPart)) {