From 75aead9d4f139fb5b66b5e8ee3cfe33177778437 Mon Sep 17 00:00:00 2001 From: Steffen Kamper Date: Wed, 24 Nov 2010 13:58:25 +0000 Subject: [PATCH] Fixed bug #14050: CleanUp - CGL format of t3lib files - t3lib_rteapi git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@9565 709f56b5-9817-0410-a4d7-c38de5d9e867 --- ChangeLog | 1 + t3lib/class.t3lib_rteapi.php | 128 ++++++++++++++++------------------- 2 files changed, 58 insertions(+), 71 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68b8ac448c99..0cbfed945a5a 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 2010-11-24 Steffen Kamper + * Fixed bug #14050: CleanUp - CGL format of t3lib files - t3lib_rteapi * Fixed bug #14050: CleanUp - CGL format of t3lib files - t3lib_registry * Fixed bug #14050: CleanUp - CGL format of t3lib files - t3lib_refindex * Fixed bug #14050: CleanUp - CGL format of t3lib files - t3lib_recordlist diff --git a/t3lib/class.t3lib_rteapi.php b/t3lib/class.t3lib_rteapi.php index d265b51b0887..c2606f3456f4 100644 --- a/t3lib/class.t3lib_rteapi.php +++ b/t3lib/class.t3lib_rteapi.php @@ -1,29 +1,29 @@ errorLog = array(); - if (!$CLIENT['FORMSTYLE']) $this->errorLog[] = 'RTE API: Browser didn\'t support styles'; + if (!$CLIENT['FORMSTYLE']) { + $this->errorLog[] = 'RTE API: Browser didn\'t support styles'; + } - if (!count($this->errorLog)) return TRUE; + if (!count($this->errorLog)) { + return TRUE; + } } /** @@ -115,17 +110,18 @@ class t3lib_rteapi { * @param integer PID value of record (true parent page id) * @return string HTML code for RTE! */ - function drawRTE(&$pObj,$table,$field,$row,$PA,$specConf,$thisConfig,$RTEtypeVal,$RTErelPath,$thePidValue) { + function drawRTE(&$pObj, $table, $field, $row, $PA, $specConf, $thisConfig, $RTEtypeVal, $RTErelPath, $thePidValue) { // Transform value: - $value = $this->transformContent('rte',$PA['itemFormElValue'],$table,$field,$row,$specConf,$thisConfig,$RTErelPath,$thePidValue); + $value = $this->transformContent('rte', $PA['itemFormElValue'], $table, $field, $row, $specConf, $thisConfig, $RTErelPath, $thePidValue); // Create item: $item = ' - '.$this->triggerField($PA['itemFormElName']).' - '; + ' . $this->triggerField($PA['itemFormElName']) . ' + '; // Return form item: return $item; @@ -148,18 +144,18 @@ class t3lib_rteapi { * @param integer PID value of record (true parent page id) * @return string Transformed content */ - function transformContent($dirRTE,$value,$table,$field,$row,$specConf,$thisConfig,$RTErelPath,$pid) { + function transformContent($dirRTE, $value, $table, $field, $row, $specConf, $thisConfig, $RTErelPath, $pid) { -#debug(array($dirRTE,$value,$table,$field,array(),$specConf,$thisConfig,$RTErelPath,$pid)); + #debug(array($dirRTE,$value,$table,$field,array(),$specConf,$thisConfig,$RTErelPath,$pid)); - if ($specConf['rte_transform']) { + if ($specConf['rte_transform']) { $p = t3lib_BEfunc::getSpecConfParametersFromArray($specConf['rte_transform']['parameters']); - if ($p['mode']) { // There must be a mode set for transformation -#debug($p['mode'],'MODE'); + if ($p['mode']) { // There must be a mode set for transformation + #debug($p['mode'],'MODE'); // Initialize transformation: $parseHTML = t3lib_div::makeInstance('t3lib_parsehtml_proc'); - $parseHTML->init($table.':'.$field, $pid); + $parseHTML->init($table . ':' . $field, $pid); $parseHTML->setRelPath($RTErelPath); // Perform transformation: @@ -167,21 +163,11 @@ class t3lib_rteapi { } } -#debug(array($dirRTE,$value),'OUT: '.$dirRTE); + #debug(array($dirRTE,$value),'OUT: '.$dirRTE); return $value; } - - - - - - - - - - /*********************************** * * Helper functions @@ -194,17 +180,17 @@ class t3lib_rteapi { * @param string Field name of the RTE field. * @return string field of type "hidden" with a flag telling the TCEmain that this fields content should be traansformed back to database state. */ - function triggerField($fieldName) { + function triggerField($fieldName) { - $triggerFieldName = preg_replace('/\[([^]]+)\]$/','[_TRANSFORM_\1]', $fieldName); - return ''; + $triggerFieldName = preg_replace('/\[([^]]+)\]$/', '[_TRANSFORM_\1]', $fieldName); + return ''; } } /** * @deprecated since TYPO3 4.4: Use XCLASS t3lib/class.t3lib_rteapi.php instead. Will be removed in TYPO3 4.6. */ -if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rte/class.tx_rte_base.php']) { +if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rte/class.tx_rte_base.php']) { t3lib_div::deprecationLog('XCLASS "ext/rte/class.tx_rte_base.php" is deprecated since TYPO3 4.4 - use "t3lib/class.t3lib_rteapi.php" instead.'); include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rte/class.tx_rte_base.php']); } -- 2.20.1