2010-11-26 Steffen Kamper <steffen@typo3.org>
+ * Fixed bug #16569: Violation of naming conventions in t3lib_content_
* Fixed bug #16487: modulemenu.js breaks livesearch "Show all" when already in list module (Thanks to Andreas Kiessling)
2010-11-26 Christian Kuhn <lolli@schwarzbu.ch>
'tslib_content_abstract' => PATH_tslib . 'content/class.tslib_content_abstract.php',
'tslib_content_case' => PATH_tslib . 'content/class.tslib_content_case.php',
'tslib_content_cleargif' => PATH_tslib . 'content/class.tslib_content_cleargif.php',
- 'tslib_content_contentobjectarray_internal' => PATH_tslib . 'content/class.tslib_content_contentobjectarray_internal.php',
+ 'tslib_content_contentobjectarrayinternal' => PATH_tslib . 'content/class.tslib_content_contentobjectarrayinternal.php',
'tslib_content_contentobjectarray' => PATH_tslib . 'content/class.tslib_content_contentobjectarray.php',
'tslib_content_columns' => PATH_tslib . 'content/class.tslib_content_columns.php',
'tslib_content_content' => PATH_tslib . 'content/class.tslib_content_content.php',
'tslib_content_media' => PATH_tslib . 'content/class.tslib_content_media.php',
'tslib_content_multimedia' => PATH_tslib . 'content/class.tslib_content_multimedia.php',
'tslib_content_offsettable' => PATH_tslib . 'content/class.tslib_content_offsettable.php',
- 'tslib_content_phpscript_internal' => PATH_tslib . 'content/class.tslib_content_phpscript_internal.php',
+ 'tslib_content_phpscriptinternal' => PATH_tslib . 'content/class.tslib_content_phpscriptinternal.php',
'tslib_content_phpscript' => PATH_tslib . 'content/class.tslib_content_phpscript.php',
'tslib_content_quicktimeobject' => PATH_tslib . 'content/class.tslib_content_quicktimeobject.php',
'tslib_content_records' => PATH_tslib . 'content/class.tslib_content_records.php',
'tslib_content_shockwaveflashobject' => PATH_tslib . 'content/class.tslib_content_shockwaveflashobject.php',
'tslib_content_template' => PATH_tslib . 'content/class.tslib_content_template.php',
'tslib_content_text' => PATH_tslib . 'content/class.tslib_content_text.php',
- 'tslib_content_user_internal' => PATH_tslib . 'content/class.tslib_content_user_internal.php',
+ 'tslib_content_userinternal' => PATH_tslib . 'content/class.tslib_content_userinternal.php',
'tslib_content_user' => PATH_tslib . 'content/class.tslib_content_user.php',
'tslib_content_editpanel' => PATH_tslib . 'content/class.tslib_content_editpanel.php',
);
-?>
\ No newline at end of file
+?>
'CLEARGIF' => 'ClearGif',
'COBJ_ARRAY' => 'ContentObjectArray',
'COA' => 'ContentObjectArray',
- 'COA_INT' => 'ContentObjectArray_Internal',
+ 'COA_INT' => 'ContentObjectArrayInternal',
'USER' => 'User',
- 'USER_INT' => 'User_Internal',
+ 'USER_INT' => 'UserInternal',
'FILE' => 'File',
'IMAGE' => 'Image',
'IMG_RESOURCE' => 'ImageResource',
'FORM' => 'Form',
'SEARCHRESULT' => 'SearchResult',
'PHP_SCRIPT' => 'PhpScript',
- 'PHP_SCRIPT_INT' => 'PhpScript_Internal',
+ 'PHP_SCRIPT_INT' => 'PhpScriptInternal',
'TEMPLATE' => 'Template',
'FLUIDTEMPLATE' => 'FluidTemplate',
'MULTIMEDIA' => 'Multimedia',
include_once ($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/class.tslib_content.php']);
}
-?>
\ No newline at end of file
+?>
+++ /dev/null
-<?php
-/***************************************************************
- * Copyright notice
- *
- * (c) 2010 Xavier Perseguers <typo3@perseguers.ch>
- * (c) 2010 Steffen Kamper <steffen@typo3.org>
- * 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.
- * A copy is found in the textfile GPL.txt and important notices to the license
- * from the author is found in LICENSE.txt distributed with these scripts.
- *
- *
- * 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!
- ***************************************************************/
-
-/**
- * Contains COA_INT class object.
- *
- * $Id: class.tslib_content.php 7905 2010-06-13 14:42:33Z ohader $
- * @author Xavier Perseguers <typo3@perseguers.ch>
- * @author Steffen Kamper <steffen@typo3.org>
- */
-class tslib_content_ContentObjectArray_Internal extends tslib_content_Abstract {
-
- /**
- * Rendering the cObject, COA_INT
- *
- * @param array Array of TypoScript properties
- * @return string Output
- */
- public function render($conf = array()) {
- if (is_array($conf)) {
- $substKey = 'INT_SCRIPT.' . $GLOBALS['TSFE']->uniqueHash();
- $includeLibs = isset($conf['includeLibs.'])
- ? $this->cObj->stdWrap($conf['includeLibs'], $conf['includeLibs.'])
- : $conf['includeLibs'];
-
- $content = '<!--' . $substKey . '-->';
- $GLOBALS['TSFE']->config['INTincScript'][$substKey] = array (
- 'file' => $includeLibs,
- 'conf' => $conf,
- 'cObj' => serialize($this->cObj),
- 'type' => 'COA'
- );
- return $content;
- } else {
- $GLOBALS['TT']->setTSlogMessage('No elements in this content object array (COA_INT).', 2);
- }
- }
-
-}
-
-
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_contentobjectarray_internal.php']) {
- include_once ($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_contentobjectarray_internal.php']);
-}
-
-?>
\ No newline at end of file
--- /dev/null
+<?php
+/***************************************************************
+ * Copyright notice
+ *
+ * (c) 2010 Xavier Perseguers <typo3@perseguers.ch>
+ * (c) 2010 Steffen Kamper <steffen@typo3.org>
+ * 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.
+ * A copy is found in the textfile GPL.txt and important notices to the license
+ * from the author is found in LICENSE.txt distributed with these scripts.
+ *
+ *
+ * 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!
+ ***************************************************************/
+
+/**
+ * Contains COA_INT class object.
+ *
+ * $Id: class.tslib_content.php 7905 2010-06-13 14:42:33Z ohader $
+ * @author Xavier Perseguers <typo3@perseguers.ch>
+ * @author Steffen Kamper <steffen@typo3.org>
+ */
+class tslib_content_ContentObjectArrayInternal extends tslib_content_Abstract {
+
+ /**
+ * Rendering the cObject, COA_INT
+ *
+ * @param array Array of TypoScript properties
+ * @return string Output
+ */
+ public function render($conf = array()) {
+ if (is_array($conf)) {
+ $substKey = 'INT_SCRIPT.' . $GLOBALS['TSFE']->uniqueHash();
+ $includeLibs = isset($conf['includeLibs.'])
+ ? $this->cObj->stdWrap($conf['includeLibs'], $conf['includeLibs.'])
+ : $conf['includeLibs'];
+
+ $content = '<!--' . $substKey . '-->';
+ $GLOBALS['TSFE']->config['INTincScript'][$substKey] = array (
+ 'file' => $includeLibs,
+ 'conf' => $conf,
+ 'cObj' => serialize($this->cObj),
+ 'type' => 'COA'
+ );
+ return $content;
+ } else {
+ $GLOBALS['TT']->setTSlogMessage('No elements in this content object array (COA_INT).', 2);
+ }
+ }
+
+}
+
+
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_contentobjectarrayinternal.php']) {
+ include_once ($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_contentobjectarrayinternal.php']);
+}
+
+?>
\ No newline at end of file
+++ /dev/null
-<?php
-/***************************************************************
- * Copyright notice
- *
- * (c) 2010 Xavier Perseguers <typo3@perseguers.ch>
- * (c) 2010 Steffen Kamper <steffen@typo3.org>
- * 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.
- * A copy is found in the textfile GPL.txt and important notices to the license
- * from the author is found in LICENSE.txt distributed with these scripts.
- *
- *
- * 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!
- ***************************************************************/
-
-/**
- * Contains PHP_SCRIPT_INT class object.
- *
- * $Id: class.tslib_content.php 7905 2010-06-13 14:42:33Z ohader $
- * @author Xavier Perseguers <typo3@perseguers.ch>
- * @author Steffen Kamper <steffen@typo3.org>
- */
-class tslib_content_PhpScript_Internal extends tslib_content_Abstract {
-
- /**
- * Rendering the cObject, PHP_SCRIPT_INT and PHP_SCRIPT_EXT
- *
- * @param array Array of TypoScript properties
- * @return string Output
- */
- public function render($conf = array(), $ext) {
- $incFile = $GLOBALS['TSFE']->tmpl->getFileName($conf['file']);
- $content = '';
- if ($incFile && $GLOBALS['TSFE']->checkFileInclude($incFile)) {
- $substKey = $ext . '_SCRIPT.' . $GLOBALS['TSFE']->uniqueHash();
- $content .= '<!--' . $substKey . '-->';
- $GLOBALS['TSFE']->config[$ext . 'incScript'][$substKey] = array (
- 'file' => $incFile, 'conf' => $conf, 'type' => 'SCRIPT'
- );
- if ($ext == 'INT') {
- $GLOBALS['TSFE']->config[$ext . 'incScript'][$substKey]['cObj'] = serialize($this);
- } else {
- $GLOBALS['TSFE']->config[$ext . 'incScript'][$substKey]['data'] = $this->cObj->data;
- }
- }
- return $content;
- }
-
-}
-
-
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_phpscript_internal.php']) {
- include_once ($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_phpscript_internal.php']);
-}
-
-?>
\ No newline at end of file
--- /dev/null
+<?php
+/***************************************************************
+ * Copyright notice
+ *
+ * (c) 2010 Xavier Perseguers <typo3@perseguers.ch>
+ * (c) 2010 Steffen Kamper <steffen@typo3.org>
+ * 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.
+ * A copy is found in the textfile GPL.txt and important notices to the license
+ * from the author is found in LICENSE.txt distributed with these scripts.
+ *
+ *
+ * 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!
+ ***************************************************************/
+
+/**
+ * Contains PHP_SCRIPT_INT class object.
+ *
+ * $Id: class.tslib_content.php 7905 2010-06-13 14:42:33Z ohader $
+ * @author Xavier Perseguers <typo3@perseguers.ch>
+ * @author Steffen Kamper <steffen@typo3.org>
+ */
+class tslib_content_PhpScriptInternal extends tslib_content_Abstract {
+
+ /**
+ * Rendering the cObject, PHP_SCRIPT_INT and PHP_SCRIPT_EXT
+ *
+ * @param array Array of TypoScript properties
+ * @return string Output
+ */
+ public function render($conf = array(), $ext) {
+ $incFile = $GLOBALS['TSFE']->tmpl->getFileName($conf['file']);
+ $content = '';
+ if ($incFile && $GLOBALS['TSFE']->checkFileInclude($incFile)) {
+ $substKey = $ext . '_SCRIPT.' . $GLOBALS['TSFE']->uniqueHash();
+ $content .= '<!--' . $substKey . '-->';
+ $GLOBALS['TSFE']->config[$ext . 'incScript'][$substKey] = array (
+ 'file' => $incFile, 'conf' => $conf, 'type' => 'SCRIPT'
+ );
+ if ($ext == 'INT') {
+ $GLOBALS['TSFE']->config[$ext . 'incScript'][$substKey]['cObj'] = serialize($this);
+ } else {
+ $GLOBALS['TSFE']->config[$ext . 'incScript'][$substKey]['data'] = $this->cObj->data;
+ }
+ }
+ return $content;
+ }
+
+}
+
+
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_phpscriptinternal.php']) {
+ include_once ($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_phpscriptinternal.php']);
+}
+
+?>
\ No newline at end of file
+++ /dev/null
-<?php
-/***************************************************************
- * Copyright notice
- *
- * (c) 2010 Xavier Perseguers <typo3@perseguers.ch>
- * (c) 2010 Steffen Kamper <steffen@typo3.org>
- * 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.
- * A copy is found in the textfile GPL.txt and important notices to the license
- * from the author is found in LICENSE.txt distributed with these scripts.
- *
- *
- * 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!
- ***************************************************************/
-
-/**
- * Contains USER_INT class object.
- *
- * $Id: class.tslib_content.php 7905 2010-06-13 14:42:33Z ohader $
- * @author Xavier Perseguers <typo3@perseguers.ch>
- * @author Steffen Kamper <steffen@typo3.org>
- */
-class tslib_content_User_Internal extends tslib_content_Abstract {
-
- /**
- * Rendering the cObject, USER_INT
- *
- * @param array Array of TypoScript properties
- * @return string Output
- */
- public function render($conf = array()) {
- $this->cObj->setUserObjectType(tslib_cObj::OBJECTTYPE_USER_INT);
- $substKey = 'INT_SCRIPT.' . $GLOBALS['TSFE']->uniqueHash();
- $content = '<!--' . $substKey . '-->';
- $GLOBALS['TSFE']->config['INTincScript'][$substKey] = array (
- 'file' => $conf['includeLibs'],
- 'conf' => $conf,
- 'cObj' => serialize($this->cObj),
- 'type' => 'FUNC'
- );
- $this->cObj->setUserObjectType(FALSE);
- return $content;
- }
-
-}
-
-
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_user_internal.php']) {
- include_once ($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_user_internal.php']);
-}
-
-?>
\ No newline at end of file
--- /dev/null
+<?php
+/***************************************************************
+ * Copyright notice
+ *
+ * (c) 2010 Xavier Perseguers <typo3@perseguers.ch>
+ * (c) 2010 Steffen Kamper <steffen@typo3.org>
+ * 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.
+ * A copy is found in the textfile GPL.txt and important notices to the license
+ * from the author is found in LICENSE.txt distributed with these scripts.
+ *
+ *
+ * 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!
+ ***************************************************************/
+
+/**
+ * Contains USER_INT class object.
+ *
+ * $Id: class.tslib_content.php 7905 2010-06-13 14:42:33Z ohader $
+ * @author Xavier Perseguers <typo3@perseguers.ch>
+ * @author Steffen Kamper <steffen@typo3.org>
+ */
+class tslib_content_UserInternal extends tslib_content_Abstract {
+
+ /**
+ * Rendering the cObject, USER_INT
+ *
+ * @param array Array of TypoScript properties
+ * @return string Output
+ */
+ public function render($conf = array()) {
+ $this->cObj->setUserObjectType(tslib_cObj::OBJECTTYPE_USER_INT);
+ $substKey = 'INT_SCRIPT.' . $GLOBALS['TSFE']->uniqueHash();
+ $content = '<!--' . $substKey . '-->';
+ $GLOBALS['TSFE']->config['INTincScript'][$substKey] = array (
+ 'file' => $conf['includeLibs'],
+ 'conf' => $conf,
+ 'cObj' => serialize($this->cObj),
+ 'type' => 'FUNC'
+ );
+ $this->cObj->setUserObjectType(FALSE);
+ return $content;
+ }
+
+}
+
+
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_userinternal.php']) {
+ include_once ($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_userinternal.php']);
+}
+
+?>
\ No newline at end of file
projects / Packages / TYPO3.CMS.git / commitdiff