Index: typo3/sysext/em/classes/connection/class.tx_em_connection_extdirectserver.php
===================================================================
--- typo3/sysext/em/classes/connection/class.tx_em_connection_extdirectserver.php (revision 9485)
+++ typo3/sysext/em/classes/connection/class.tx_em_connection_extdirectserver.php (revision )
@@ -73,7 +73,7 @@
* @return void
*/
public function __construct() {
- $GLOBALS['TBE_TEMPLATE'] = t3lib_div::makeInstance('template');
+
}
Index: typo3/sysext/em/classes/index.php
===================================================================
--- typo3/sysext/em/classes/index.php (revision 9507)
+++ typo3/sysext/em/classes/index.php (revision )
@@ -480,7 +480,7 @@
} elseif ($this->CMD['importExt'] || $this->CMD['uploadExt']) { // Imports an extension from online rep.
$err = $this->importExtFromRep($this->CMD['importExt'], $this->CMD['extVersion'], $this->CMD['loc'], $this->CMD['uploadExt']);
if ($err) {
- $this->content .= $this->doc->section('', $GLOBALS['TBE_TEMPLATE']->rfw($err));
+ $this->content .= $this->doc->section('', tx_em_Tools::rfw($err));
}
if (!$err && $this->CMD['importExt']) {
$this->translations->installTranslationsForExtension($this->CMD['importExt'], $this->getMirrorURL());
@@ -790,7 +790,7 @@
'SET[singleDetails]' => 'info'
))) . '">' . tx_em_Tools::installButton() . '';
if (in_array($extKey, $this->requiredExt)) {
- $loadUnloadLink = '' . $GLOBALS['TBE_TEMPLATE']->rfw($GLOBALS['LANG']->getLL('extension_required_short')) . '';
+ $loadUnloadLink = '' . tx_em_Tools::rfw($GLOBALS['LANG']->getLL('extension_required_short')) . '';
}
$lines[] = $this->extensionList->extensionListRow($extKey, $inst_list[$extKey], array('
' . $loadUnloadLink . ' | '), t3lib_extMgm::isLoaded($extKey) ? 'em-listbg1' : 'em-listbg2');
}
@@ -1711,12 +1711,12 @@
'' . $saveMD5 . ''
) . '
';
if ($fileMD5 != $saveMD5) {
- $info .= $GLOBALS['TBE_TEMPLATE']->rfw(
+ $info .= tx_em_Tools::rfw(
'
' . $GLOBALS['LANG']->getLL('ext_details_saving_failed_changes_lost') . ''
) . '
';
}
else {
- $info .= $GLOBALS['TBE_TEMPLATE']->rfw(
+ $info .= tx_em_Tools::rfw(
'
' . $GLOBALS['LANG']->getLL('ext_details_file_saved') . ''
) . '
';
}
@@ -1733,7 +1733,7 @@
$GLOBALS['LANG']->getLL('ext_details_file_save_button') . '" />';
}
else {
- $outCode .= $GLOBALS['TBE_TEMPLATE']->rfw(
+ $outCode .= tx_em_Tools::rfw(
'
' . $GLOBALS['LANG']->getLL('ext_details_saving_disabled') . ' '
);
}
@@ -2342,15 +2342,15 @@
|
Index: typo3/sysext/em/classes/extensions/class.tx_em_extensions_details.php
===================================================================
--- typo3/sysext/em/classes/extensions/class.tx_em_extensions_details.php (revision 9440)
+++ typo3/sysext/em/classes/extensions/class.tx_em_extensions_details.php (revision )
@@ -657,7 +657,7 @@
if (!t3lib_div::inList($this->parentObject->nameSpaceExceptions, $extKey)) {
$dataCol = t3lib_utility_Debug::viewarray($techInfo['NSerrors']);
} else {
- $dataCol = $GLOBALS['TBE_TEMPLATE']->dfw($GLOBALS['LANG']->getLL('extInfoArray_exception'));
+ $dataCol = tx_em_Tools::dfw($GLOBALS['LANG']->getLL('extInfoArray_exception'));
}
}
Index: typo3/sysext/em/classes/extensions/class.tx_em_extensions_list.php
===================================================================
--- typo3/sysext/em/classes/extensions/class.tx_em_extensions_list.php (revision 9507)
+++ typo3/sysext/em/classes/extensions/class.tx_em_extensions_list.php (revision )
@@ -267,7 +267,7 @@
foreach ($extEkeys as $extKey => $data) {
if (array_key_exists($extKey, $TYPO3_LOADED_EXT) && ($this->parentObject->MOD_SETTINGS['display_shy'] || !$list[$extKey]['EM_CONF']['shy']) && $this->parentObject->searchExtension($extKey, $list[$extKey])) {
if (in_array($extKey, $this->parentObject->requiredExt)) {
- $loadUnloadLink = '' . $GLOBALS['TBE_TEMPLATE']->rfw($GLOBALS['LANG']->getLL('extension_required_short')) . '';
+ $loadUnloadLink = '' . tx_em_Tools::rfw($GLOBALS['LANG']->getLL('extension_required_short')) . '';
} else {
$loadUnloadLink = '' . tx_em_Tools::installButton() . '';
if (in_array($extKey, $this->parentObject->requiredExt)) {
- $loadUnloadLink = '' . $GLOBALS['TBE_TEMPLATE']->rfw($GLOBALS['LANG']->getLL('extension_required_short')) . '';
+ $loadUnloadLink = '' . tx_em_Tools::rfw($GLOBALS['LANG']->getLL('extension_required_short')) . '';
}
$theRowClass = t3lib_extMgm::isLoaded($extKey) ? 'em-listbg1' : 'em-listbg2';
$extensions[] = $this->extensionListRow($extKey, $list[$extKey], array('' . $loadUnloadLink . ' | '), $theRowClass);
@@ -496,7 +496,7 @@
$cells[] = '' . (is_array($techInfo['moduleNames']) ? implode(' ', $techInfo['moduleNames']) : '') . ' | ';
$cells[] = '' . ($techInfo['conf'] ? $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:yes') : '') . ' | ';
$cells[] = '' .
- $GLOBALS['TBE_TEMPLATE']->rfw((t3lib_extMgm::isLoaded($extKey) && $techInfo['tables_error'] ?
+ tx_em_Tools::rfw((t3lib_extMgm::isLoaded($extKey) && $techInfo['tables_error'] ?
'' . $GLOBALS['LANG']->getLL('extInfoArray_table_error') . ' ' .
$GLOBALS['LANG']->getLL('extInfoArray_missing_fields') : '') .
(t3lib_extMgm::isLoaded($extKey) && $techInfo['static_error'] ?
@@ -508,22 +508,22 @@
$cells[] = ' | ' . (is_array($techInfo['locallang']) ? implode(' ', $techInfo['locallang']) : '') . ' | ';
$cells[] = '' . (is_array($techInfo['classes']) ? implode(' ', $techInfo['classes']) : '') . ' | ';
- $cells[] = '' . (is_array($techInfo['errors']) ? $GLOBALS['TBE_TEMPLATE']->rfw(implode(' ', $techInfo['errors'])) : '') . ' | ';
+ $cells[] = '' . (is_array($techInfo['errors']) ? tx_em_Tools::rfw(implode(' ', $techInfo['errors'])) : '') . ' | ';
$cells[] = '' . (is_array($techInfo['NSerrors']) ?
(!t3lib_div::inList($this->parentObject->nameSpaceExceptions, $extKey) ?
t3lib_utility_Debug::viewarray($techInfo['NSerrors']) :
- $GLOBALS['TBE_TEMPLATE']->dfw($GLOBALS['LANG']->getLL('extInfoArray_exception'))) : '') . ' | ';
+ tx_em_Tools::dfw($GLOBALS['LANG']->getLL('extInfoArray_exception'))) : '') . '';
} elseif ($this->parentObject->MOD_SETTINGS['display_details'] == 5) {
$currentMd5Array = $this->parentObject->extensionDetails->serverExtensionMD5array($extKey, $extInfo);
$affectedFiles = '';
$msgLines = array();
$msgLines[] = $GLOBALS['LANG']->getLL('listRow_files') . ' ' . count($currentMd5Array);
if (strcmp($extInfo['EM_CONF']['_md5_values_when_last_written'], serialize($currentMd5Array))) {
- $msgLines[] = $GLOBALS['TBE_TEMPLATE']->rfw('
' . $GLOBALS['LANG']->getLL('extInfoArray_difference_detected') . '');
+ $msgLines[] = tx_em_Tools::rfw('
' . $GLOBALS['LANG']->getLL('extInfoArray_difference_detected') . '');
$affectedFiles = tx_em_Tools::findMD5ArrayDiff($currentMd5Array, unserialize($extInfo['EM_CONF']['_md5_values_when_last_written']));
if (count($affectedFiles)) {
$msgLines[] = '
' . $GLOBALS['LANG']->getLL('extInfoArray_modified_files') . '
' .
- $GLOBALS['TBE_TEMPLATE']->rfw(implode('
', $affectedFiles));
+ tx_em_Tools::rfw(implode('
', $affectedFiles));
}
}
$cells[] = '' . implode(' ', $msgLines) . ' | ';
@@ -532,7 +532,7 @@
$verDiff = $inst_list[$extKey] && tx_em_Tools::versionDifference($extInfo['EM_CONF']['version'], $inst_list[$extKey]['EM_CONF']['version'], $this->parentObject->versionDiffFactor);
$cells[] = '' . $extKey . ' | ';
- $cells[] = '' . ($verDiff ? '' . $GLOBALS['TBE_TEMPLATE']->rfw(htmlspecialchars($extInfo['EM_CONF']['version'])) . '' : $extInfo['EM_CONF']['version']) . ' | ';
+ $cells[] = '' . ($verDiff ? '' . tx_em_Tools::rfw(htmlspecialchars($extInfo['EM_CONF']['version'])) . '' : $extInfo['EM_CONF']['version']) . ' | ';
if (!$import) { // Listing extension on LOCAL server:
// Extension Download:
$cells[] = '' . $GLOBALS['TBE_TEMPLATE']->rfw($extInfo['doubleInstall']) . '';
+ $doubleInstall = ' ' . tx_em_Tools::rfw($extInfo['doubleInstall']) . '';
}
$cells[] = ' | ' . $this->parentObject->typeLabels[$extInfo['type']] . $doubleInstall . ' | ';
} else { // Listing extensions from REMOTE repository:
$inst_curVer = $inst_list[$extKey]['EM_CONF']['version'];
if (isset($inst_list[$extKey])) {
if ($verDiff) {
- $inst_curVer = '' . $GLOBALS['TBE_TEMPLATE']->rfw($inst_curVer) . '';
+ $inst_curVer = '' . tx_em_Tools::rfw($inst_curVer) . '';
}
}
$cells[] = '' . t3lib_befunc::date($extInfo['EM_CONF']['lastuploaddate']) . ' | ';
$cells[] = '' . htmlspecialchars(t3lib_div::fixed_lgd_cs($extInfo['EM_CONF']['author'], $GLOBALS['BE_USER']->uc[titleLen])) . ' | ';
$cells[] = '' . $inst_curVer . ' | ';
- $cells[] = '' . $this->parentObject->typeLabels[$inst_list[$extKey]['type']] . (strlen($inst_list[$extKey]['doubleInstall']) > 1 ? ' ' . $GLOBALS['TBE_TEMPLATE']->rfw($inst_list[$extKey]['doubleInstall']) . '' : '') . ' | ';
+ $cells[] = '' . $this->parentObject->typeLabels[$inst_list[$extKey]['type']] . (strlen($inst_list[$extKey]['doubleInstall']) > 1 ? ' ' . tx_em_Tools::rfw($inst_list[$extKey]['doubleInstall']) . '' : '') . ' | ';
$cells[] = '' . ($extInfo['downloadcounter_all'] ? $extInfo['downloadcounter_all'] : ' ') . '/' . ($extInfo['downloadcounter'] ? $extInfo['downloadcounter'] : ' ') . ' | ';
}
$cells[] = '' . $this->parentObject->states[$extInfo['EM_CONF']['state']] . ' | ';
@@ -679,11 +679,11 @@
}
$warn = '';
if (strcmp(serialize($currentMD5Array), serialize($serverMD5Array))) {
- $warn = '' . $GLOBALS['TBE_TEMPLATE']->rfw(' ' . $name . ': ' . $LANG->sL('LLL:EXT:lang/locallang_mod_tools_em.xml:msg_warn_diff') . '') . ' |
' . LF;
+ $warn = '' . tx_em_Tools::rfw(' ' . $name . ': ' . $LANG->sL('LLL:EXT:lang/locallang_mod_tools_em.xml:msg_warn_diff') . '') . ' |
' . LF;
if ($this->parentObject->MOD_SETTINGS['display_files'] == 1) {
$affectedFiles = tx_em_Tools::findMD5ArrayDiff($serverMD5Array, $currentMD5Array);
if (count($affectedFiles)) {
- $warn .= '' . $LANG->sL('LLL:EXT:lang/locallang_mod_tools_em.xml:msg_modified') . ' ' . $GLOBALS['TBE_TEMPLATE']->rfw(implode(' ', $affectedFiles)) . ' |
' . LF;
+ $warn .= '' . $LANG->sL('LLL:EXT:lang/locallang_mod_tools_em.xml:msg_modified') . ' ' . tx_em_Tools::rfw(implode(' ', $affectedFiles)) . ' |
' . LF;
}
}
}
@@ -697,7 +697,7 @@
'' . $name . ' | ' .
'' . $data[EM_CONF][version] . ' | ' .
'' . $lastversion . ' | ' .
- '' . $this->parentObject->typeLabels[$data['type']] . (strlen($data['doubleInstall']) > 1 ? ' ' . $GLOBALS['TBE_TEMPLATE']->rfw($extInfo['doubleInstall']) . '' : '') . ' | ' .
+ '' . $this->parentObject->typeLabels[$data['type']] . (strlen($data['doubleInstall']) > 1 ? ' ' . $tx_em_Tools::rfw($extInfo['doubleInstall']) . '' : '') . ' | ' .
'' . $comment . ' | ' . LF .
$warn .
'
|
' . LF;
Index: typo3/sysext/em/classes/install/class.tx_em_install.php
===================================================================
--- typo3/sysext/em/classes/install/class.tx_em_install.php (revision 9507)
+++ typo3/sysext/em/classes/install/class.tx_em_install.php (revision )
@@ -405,7 +405,7 @@
}
}
if ($depError || $depIgnore) {
- $content .= $GLOBALS['TBE_TEMPLATE']->section(
+ $content .= $this->parentObject->doc->section(
$GLOBALS['LANG']->getLL('removeExtFromList_dependency_error'),
implode('
', $msg), 0, 1, 2
);
@@ -451,7 +451,7 @@
}
}
if ($conflictError || $conflictIgnore) {
- $content .= $GLOBALS['TBE_TEMPLATE']->section(
+ $content .= $this->parentObject->doc->section(
$GLOBALS['LANG']->getLL('checkDependencies_conflict_error'), implode('
', $msg), 0, 1, 2
);
}
@@ -500,7 +500,7 @@
}
}
if ($suggestion || $suggestionIgnore) {
- $content .= $GLOBALS['TBE_TEMPLATE']->section(
+ $content .= $this->parentObject->doc->section(
sprintf($GLOBALS['LANG']->getLL('checkDependencies_exts_suggested_by_ext'), $extKey),
implode('
', $msg), 0, 1, 1
);
Index: typo3/sysext/em/classes/tools/class.tx_em_tools.php
===================================================================
--- typo3/sysext/em/classes/tools/class.tx_em_tools.php (revision 9507)
+++ typo3/sysext/em/classes/tools/class.tx_em_tools.php (revision )
@@ -936,7 +936,7 @@
substr($confFilePath, strlen(PATH_site))
);
} else {
- return $GLOBALS["TBE_TEMPLATE"]->rfw(
+ return tx_em_Tools::rfw(
sprintf($GLOBALS['LANG']->getLL('writeModPath_error'),
$confFilePath)
);