Index: typo3/mod/tools/em/class.em_index.php
===================================================================
--- typo3/mod/tools/em/class.em_index.php (revision 6105)
+++ typo3/mod/tools/em/class.em_index.php (working copy)
@@ -1726,7 +1726,13 @@
) .
$GLOBALS['LANG']->getLL('translation_problems') . '
';
} elseif($extmd5 == $localmd5) {
- $content .= '' . $GLOBALS['LANG']->getLL('ext_import_list_unchanged') . '
';
+ $flashMessage = t3lib_div::makeInstance(
+ 't3lib_FlashMessage',
+ $GLOBALS['LANG']->getLL('ext_import_list_unchanged'),
+ $GLOBALS['LANG']->getLL('ext_import_list_unchanged_header'),
+ t3lib_FlashMessage::INFO
+ );
+ $content .= $flashMessage->render();
} else {
$extXML = t3lib_div::getURL($extfile, 0, array(TYPO3_user_agent));
if($extXML === false) {
@@ -1972,8 +1978,14 @@
$loc = ($loc==='G'||$loc==='S') ? $loc : 'L';
$comingExtPath = PATH_site.$this->typePaths[$loc].$extKey.'/';
if (@is_dir($comingExtPath)) {
- return sprintf($GLOBALS['LANG']->getLL('ext_import_ext_present_no_overwrite'), $comingExtPath) .
- '
' . $GLOBALS['LANG']->getLL('ext_import_ext_present_nothing_done');
+ $flashMessage = t3lib_div::makeInstance(
+ 't3lib_FlashMessage',
+ sprintf($GLOBALS['LANG']->getLL('ext_import_ext_present_no_overwrite'), $comingExtPath) .
+ '
' . $GLOBALS['LANG']->getLL('ext_import_ext_present_nothing_done'),
+ $GLOBALS['LANG']->getLL('error'),
+ t3lib_FlashMessage::ERROR
+ );
+ return $flashMessage->render();
} // ... else go on, install...
} // ... else go on, install...
} else return $GLOBALS['LANG']->getLL('ext_import_no_key');
@@ -2035,8 +2047,7 @@
// No content, no errors. Create success output here:
if (!$content) {
- $content = $GLOBALS['LANG']->getLL('ext_import_success') . '
' .
- sprintf($GLOBALS['LANG']->getLL('ext_import_success_folder'), $extDirPath) . '
';
+ $content = sprintf($GLOBALS['LANG']->getLL('ext_import_success_folder'), $extDirPath) . '
';
$uploadSucceed = true;
@@ -2072,6 +2083,13 @@
list($new_list)=$this->getInstalledExtensions();
$content.=$this->updatesForm($extKey,$new_list[$extKey],1,'index.php?CMD[showExt]='.$extKey.'&SET[singleDetails]=info');
}
+
+ $flashMessage = t3lib_div::makeInstance(
+ 't3lib_FlashMessage',
+ $content,
+ $GLOBALS['LANG']->getLL('ext_import_success')
+ );
+ $content = $flashMessage->render();
// Install / Uninstall:
if(!$this->CMD['standAlone']) {
@@ -2088,7 +2106,6 @@
'
' .
$GLOBALS['LANG']->getLL('ext_import_close_check') . '';
}
-
}
} else $content = $res;
} else $content = sprintf($GLOBALS['LANG']->getLL('ext_import_ext_path_different'), $extDirPath);
@@ -2824,14 +2841,21 @@
if ($this->CMD['doDelete'] && !strcmp($absPath,$this->CMD['absPath'])) {
$res = $this->removeExtDirectory($absPath);
if ($res) {
- return sprintf($GLOBALS['LANG']->getLL('extDelete_remove_dir_failed'),
- $absPath
- ) . '
' .
- nl2br($res);
+ $flashMessage = t3lib_div::makeInstance(
+ 't3lib_FlashMessage',
+ nl2br($res),
+ sprintf($GLOBALS['LANG']->getLL('extDelete_remove_dir_failed'), $absPath),
+ t3lib_FlashMessage::ERROR
+ );
+ return $flashMessage->render();
} else {
- return sprintf($GLOBALS['LANG']->getLL('extDelete_removed'),
- $absPath
+ $flashMessage = t3lib_div::makeInstance(
+ 't3lib_FlashMessage',
+ sprintf($GLOBALS['LANG']->getLL('extDelete_removed'), $absPath),
+ $GLOBALS['LANG']->getLL('extDelete_removed_header'),
+ t3lib_FlashMessage::OK
);
+ return $flashMessage->render();
}
} else {
$areYouSure = $GLOBALS['LANG']->getLL('extDelete_sure');
@@ -4392,8 +4416,13 @@
if($dontDelete) return array($extDirPath);
$res = $this->removeExtDirectory($extDirPath);
if ($res) {
- return sprintf($GLOBALS['LANG']->getLL('clearMakeExtDir_could_not_remove_dir'),
- $extDirPath) . '
' . nl2br($res);
+ $flashMessage = t3lib_div::makeInstance(
+ 't3lib_FlashMessage',
+ nl2br($res),
+ sprintf($GLOBALS['LANG']->getLL('clearMakeExtDir_could_not_remove_dir'), $extDirPath),
+ t3lib_FlashMessage::ERROR
+ );
+ return $flashMessage->render();
}
}
Index: typo3/mod/tools/em/class.em_xmlhandler.php
===================================================================
--- typo3/mod/tools/em/class.em_xmlhandler.php (revision 6105)
+++ typo3/mod/tools/em/class.em_xmlhandler.php (working copy)
@@ -402,7 +402,12 @@
gzclose($fp);
if(!$error) {
- $content.= 'The extensions list has been updated and now contains '.$extcount.' extension entries.
';
+ $flashMessage = t3lib_div::makeInstance(
+ 't3lib_FlashMessage',
+ sprintf($GLOBALS['LANG']->getLL('ext_import_extlist_updated'), $extcount),
+ $GLOBALS['LANG']->getLL('ext_import_extlist_updated_header')
+ );
+ $content .= $flashMessage->render();
}
return $content;
Index: typo3/sysext/lang/locallang_mod_tools_em.xml
===================================================================
--- typo3/sysext/lang/locallang_mod_tools_em.xml (revision 6105)
+++ typo3/sysext/lang/locallang_mod_tools_em.xml (working copy)
@@ -103,6 +103,7 @@
+
@@ -168,6 +169,9 @@
+
+
+
@@ -185,7 +189,7 @@
-
+
@@ -276,6 +280,7 @@
+