[TYPO3-core] RFC #16574: Bug/Cleanup: PHP notices from XCLASS inclusions

[Oliver Klee]

Hi,

+1 by reading except for the following parts which look like they change
more than they ought to:



> Index: typo3/sysext/statictemplates/media/scripts/xmenu_layers.diff
> ===================================================================
> --- typo3/sysext/statictemplates/media/scripts/xmenu_layers.diff	(Revision 9643)
> +++ typo3/sysext/statictemplates/media/scripts/xmenu_layers.diff	(Arbeitskopie)
> @@ -52,10 +52,10 @@
>  -$GLOBALS['TSFE']->tmpl->menuclasses.=',gmenu_layers';
>  +$GLOBALS['TSFE']->tmpl->menuclasses.=',tmenu_layers';
>   
> --if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['media/scripts/gmenu_layers.php'])	{
> --	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['media/scripts/gmenu_layers.php']);
> -+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['media/scripts/tmenu_layers.php'])	{
> -+	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['media/scripts/tmenu_layers.php']);
> +-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['media/scripts/gmenu_layers.php'])	{
> +-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['media/scripts/gmenu_layers.php']);
> ++if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['media/scripts/tmenu_layers.php'])	{
> ++	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['media/scripts/tmenu_layers.php']);
>   }

> Index: typo3/sysext/cms/tslib/media/scripts/xmenu_layers.diff
> ===================================================================
> --- typo3/sysext/cms/tslib/media/scripts/xmenu_layers.diff	(Revision 9643)
> +++ typo3/sysext/cms/tslib/media/scripts/xmenu_layers.diff	(Arbeitskopie)
> @@ -52,10 +52,10 @@
>  -$GLOBALS['TSFE']->tmpl->menuclasses.=',gmenu_layers';
>  +$GLOBALS['TSFE']->tmpl->menuclasses.=',tmenu_layers';
>   
> --if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['media/scripts/gmenu_layers.php'])	{
> --	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['media/scripts/gmenu_layers.php']);
> -+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['media/scripts/tmenu_layers.php'])	{
> -+	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['media/scripts/tmenu_layers.php']);
> +-if (defined('TYPO3_MODE') && $GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['media/scripts/gmenu_layers.php'])	{
> +-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['media/scripts/gmenu_layers.php']);
> ++if (defined('TYPO3_MODE') && $GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['media/scripts/tmenu_layers.php'])	{
> ++	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['media/scripts/tmenu_layers.php']);
>   }


> Index: typo3/sysext/cms/tslib/class.tslib_content.php
> ===================================================================
> --- typo3/sysext/cms/tslib/class.tslib_content.php	(Revision 9643)
> +++ typo3/sysext/cms/tslib/class.tslib_content.php	(Arbeitskopie)
> @@ -564,6 +564,7 @@
>  	 * @return	void
>  	 */
>  	function start($data, $table = '') {
> +		error_reporting(E_ALL);
>  		global $TYPO3_CONF_VARS;
>  		$this->data = $data;
>  		$this->table = $table;


Here, there is a typo: iset -> isset:

> Index: typo3/sysext/em/classes/tools/class.tx_em_tools.php
> ===================================================================
> --- typo3/sysext/em/classes/tools/class.tx_em_tools.php	(Revision 9643)
> +++ typo3/sysext/em/classes/tools/class.tx_em_tools.php	(Arbeitskopie)
> @@ -860,14 +860,15 @@
>  								}
>  							}
>  								// Check for proper XCLASS definition
> -								// Match $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS'] with single or doublequotes
> +								// Match $GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS'] with single or doublequotes
>  							$XclassSearch = '\$TYPO3_CONF_VARS\[TYPO3_MODE\]\[[\'"]XCLASS[\'"]\]';
>  							$XclassParts = preg_split('/if \(defined\([\'"]TYPO3_MODE[\'"]\) && ' . $XclassSearch . '/', $fContent, 2);
>  							if (count($XclassParts) !== 2) {
>  									// Match $GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS'] with single or doublequotes
>  								$XclassSearch = '\$GLOBALS\[[\'"]TYPO3_CONF_VARS[\'"]\]\[TYPO3_MODE\]\[[\'"]XCLASS[\'"]\]';
> -								$XclassParts = preg_split('/if \(defined\([\'"]TYPO3_MODE[\'"]\) && ' . $XclassSearch . '/', $fContent, 2);
> +								$XclassParts = preg_split('/if \(defined\([\'"]TYPO3_MODE[\'"]\) && [iset(]*?' . $XclassSearch . '/', $fContent, 2);



Oli
-- 
Certified TYPO3 Integrator | TYPO3 Security Team Member