Bug #18163 ยป rtehtmlarea_bugfix_7450.patch
| typo3/sysext/rtehtmlarea/class.tx_rtehtmlareaapi.php (working copy) | ||
|---|---|---|
|
* @return boolean true if this plugin object should be made available in the current environment and is correctly initialized
|
||
|
*/
|
||
|
public function main($parentObject) {
|
||
|
global $TYPO3_CONF_VARS, $LANG;
|
||
|
global $TYPO3_CONF_VARS, $LANG, $TSFE;
|
||
|
|
||
|
$this->htmlAreaRTE =& $parentObject;
|
||
|
$this->rteExtensionKey =& $this->htmlAreaRTE->ID;
|
||
|
$this->thisConfig =& $this->htmlAreaRTE->thisConfig;
|
||
|
$this->toolbar =& $this->htmlAreaRTE->toolbar;
|
||
|
$this->LOCAL_LANG =& $this->htmlAreaRTE->LOCAL_LANG;
|
||
|
|
||
|
// Check if the plugin should be disabled in frontend
|
||
|
if ($this->htmlAreaRTE->is_FE() && $TYPO3_CONF_VARS['EXTCONF'][$this->rteExtensionKey]['plugins'][$this->pluginName]['disableInFE']) {
|
||
| ... | ... | |
|
// Localization array must be initialized here
|
||
|
if ($this->relativePathToLocallangFile) {
|
||
|
if ($this->htmlAreaRTE->is_FE()) {
|
||
|
$this->LOCAL_LANG = t3lib_div::readLLfile('EXT:' . $this->extensionKey . '/' . $this->relativePathToLocallangFile, $this->htmlAreaRTE->language);
|
||
|
$this->LOCAL_LANG = array_merge_recursive($this->LOCAL_LANG, t3lib_div::readLLfile('EXT:' . $this->extensionKey . '/' . $this->relativePathToLocallangFile, $this->htmlAreaRTE->language));
|
||
|
} else {
|
||
|
$LANG->includeLLFile('EXT:' . $this->extensionKey . '/' . $this->relativePathToLocallangFile);
|
||
|
}
|
||
| typo3/sysext/rtehtmlarea/extensions/BlockElements/class.tx_rtehtmlarea_blockelements.php (working copy) | ||
|---|---|---|
|
if ($this->htmlAreaRTE->cleanList($this->thisConfig['hidePStyleItems']) != '*') {
|
||
|
foreach ($blockElementsOrder as $item) {
|
||
|
if ($this->htmlAreaRTE->is_FE()) {
|
||
|
$blockElementsOptions[$item] = $TSFE->csConvObj->conv($TSFE->getLLL($this->defaultBlockElements[$item],$this->LOCAL_LANG), $TSFE->labelsCharset, $TSFE->renderCharset);
|
||
|
$blockElementsOptions[$item] = $TSFE->csConvObj->conv($TSFE->getLLL($this->defaultBlockElements[$item],$this->LOCAL_LANG), $this->htmlAreaRTE->charset, $this->htmlAreaRTE->OutputCharset);
|
||
|
} else {
|
||
|
$blockElementsOptions[$item] = $LANG->getLL($this->defaultBlockElements[$item]);
|
||
|
}
|
||
| typo3/sysext/rtehtmlarea/extensions/DefaultFont/class.tx_rtehtmlarea_defaultfont.php (working copy) | ||
|---|---|---|
|
$defaultFontFacesList = 'nofont,';
|
||
|
if ($this->htmlAreaRTE->is_FE()) {
|
||
|
$HTMLAreaFontname['nofont'] = '
|
||
|
"' . $TSFE->csConvObj->conv($TSFE->getLLL('No font',$this->LOCAL_LANG), $TSFE->labelsCharset, $TSFE->renderCharset) . '" : ""';
|
||
|
"' . $TSFE->csConvObj->conv($TSFE->getLLL('No font',$this->LOCAL_LANG), $this->htmlAreaRTE->charset, $this->htmlAreaRTE->OutputCharset) . '" : ""';
|
||
|
} else {
|
||
|
$HTMLAreaFontname['nofont'] = '
|
||
|
"' . $LANG->getLL('No font') . '" : ""';
|
||
| ... | ... | |
|
// Builing JS array of default font sizes
|
||
|
$HTMLAreaFontSizes = array();
|
||
|
if ($this->htmlAreaRTE->is_FE()) {
|
||
|
$HTMLAreaFontSizes[0] = $TSFE->csConvObj->conv($TSFE->getLLL('No size',$this->LOCAL_LANG), $TSFE->labelsCharset, $TSFE->renderCharset);
|
||
|
$HTMLAreaFontSizes[0] = $TSFE->csConvObj->conv($TSFE->getLLL('No size',$this->LOCAL_LANG), $this->htmlAreaRTE->charset, $this->htmlAreaRTE->OutputCharset);
|
||
|
} else {
|
||
|
$HTMLAreaFontSizes[0] = $LANG->getLL('No size');
|
||
|
}
|
||
| typo3/sysext/rtehtmlarea/extensions/InlineElements/class.tx_rtehtmlarea_inlineelements.php (working copy) | ||
|---|---|---|
|
if (in_array('formattext', $this->toolbar)) {
|
||
|
if (!is_array( $this->thisConfig['buttons.']) || !is_array( $this->thisConfig['buttons.']['formattext.'])) {
|
||
|
$registerRTEinJavascriptString .= '
|
||
|
RTEarea['.$RTEcounter.']["buttons"]["formattext"] = new Object();';
|
||
|
RTEarea['.$RTEcounter.'].buttons.formattext = new Object();';
|
||
|
}
|
||
|
|
||
|
// Default inline elements
|
||
| ... | ... | |
|
$inlineElementsOptions = array();
|
||
|
foreach ($inlineElementsOrder as $item) {
|
||
|
if ($this->htmlAreaRTE->is_FE()) {
|
||
|
$inlineElementsOptions[$this->buttonToInlineElement[$item]] = $TSFE->csConvObj->conv($TSFE->getLLL($this->defaultInlineElements[$this->buttonToInlineElement[$item]],$this->LOCAL_LANG), $TSFE->labelsCharset, $TSFE->renderCharset);
|
||
|
$inlineElementsOptions[$this->buttonToInlineElement[$item]] = $TSFE->csConvObj->conv($TSFE->getLLL($this->defaultInlineElements[$this->buttonToInlineElement[$item]],$this->LOCAL_LANG), $this->htmlAreaRTE->charset, $this->htmlAreaRTE->OutputCharset);
|
||
|
} else {
|
||
|
$inlineElementsOptions[$this->buttonToInlineElement[$item]] = $LANG->getLL($this->defaultInlineElements[$this->buttonToInlineElement[$item]]);
|
||
|
}
|
||
| typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php (working copy) | ||
|---|---|---|
|
}
|
||
|
|
||
|
// Character set
|
||
|
$this->charset = $TSFE->labelsCharset;
|
||
|
$this->charset = $TSFE->labelsCharset ? $TSFE->labelsCharset : $TSFE->renderCharset;
|
||
|
$this->OutputCharset = $TSFE->metaCharset ? $TSFE->metaCharset : $TSFE->renderCharset;
|
||
|
|
||
|
// Set the charset of the content
|
||