Project

General

Profile

Bug #21785 » em-improvements.patch

Administrator Admin, 2009-12-03 12:42

View differences:

typo3/mod/tools/em/class.em_index.php (working copy)
if(!isset($instExtInfo[$depK])) {
$msg[] = '<br />' . sprintf($GLOBALS['LANG']->getLL('checkDependencies_ext_not_available'),
$depK);
$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;<img src="' . $GLOBALS['BACK_PATH'] .
$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;<a href="index.php?CMD[importExt]=' . $depK . '&CMD[loc]=L&CMD[standAlone]=1" target="_blank"><img src="' . $GLOBALS['BACK_PATH'] .
'gfx/import.gif" width="12" height="12" title="' . $GLOBALS['LANG']->getLL('checkDependencies_import_ext') . '" alt="" />&nbsp;
<a href="index.php?CMD[importExt]=' . $depK . '&CMD[loc]=L&CMD[standAlone]=1" target="_blank">' . $GLOBALS['LANG']->getLL('checkDependencies_import_now') . '</a>';
' . $GLOBALS['LANG']->getLL('checkDependencies_import_now') . '</a>';
$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" value="1" name="depsolver[ignore][' . $depK . ']" id="checkIgnore_' . $depK . '" />
<label for="checkIgnore_' . $depK . '">' . $GLOBALS['LANG']->getLL('checkDependencies_ignore_ext_requirement') . '</label>';
} else {
$msg[] = '<br />' . sprintf($GLOBALS['LANG']->getLL('checkDependencies_ext_not_installed'),
$depK, $instExtInfo[$depK]['EM_CONF']['title']);
$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;' . $this->installButton() . '&nbsp;
<a href="' . htmlspecialchars('index.php?CMD[showExt]=' . $depK . '&CMD[load]=1&CMD[clrCmd]=1&CMD[standAlone]=1&SET[singleDetails]=info') .
'" target="_blank">' . $GLOBALS['LANG']->getLL('checkDependencies_install_now') . '</a>';
$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;<a href="' . htmlspecialchars('index.php?CMD[showExt]=' . $depK . '&CMD[load]=1&CMD[clrCmd]=1&CMD[standAlone]=1&SET[singleDetails]=info') .
'" target="_blank">' . $this->installButton() . '&nbsp;
' . $GLOBALS['LANG']->getLL('checkDependencies_install_now') . '</a>';
$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" value="1" name="depsolver[ignore][' . $depK . ']" id="checkIgnore_' . $depK . '" />
<label for="checkIgnore_' . $depK . '">' . $GLOBALS['LANG']->getLL('checkDependencies_ignore_ext_requirement') . '</label>';
}
......
}
}
if($depError || $depIgnore) {
$content .= $this->doc->section(
$flashMessage = t3lib_div::makeInstance(
't3lib_FlashMessage',
$GLOBALS['LANG']->getLL('removeExtFromList_dependency_error'),
implode('<br />', $msg), 0, 1, 2
'',
t3lib_FlashMessage::ERROR
);
$content .= '<br /><br />' . $flashMessage->render() . implode('<br />', $msg);
}
// Check conflicts with other extensions:
......
}
$msg[] = sprintf($GLOBALS['LANG']->getLL('checkDependencies_conflict_remove'),
$extKey, $conflictK, $instExtInfo[$conflictK]['EM_CONF']['title'], $conflictK, $extKey);
$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;' . $this->removeButton() . '&nbsp;
<a href="' . htmlspecialchars('index.php?CMD[showExt]=' . $conflictK . '&CMD[remove]=1&CMD[clrCmd]=1&CMD[standAlone]=1&SET[singleDetails]=info') .
'" target="_blank">' . $GLOBALS['LANG']->getLL('checkDependencies_remove_now') . '</a>';
$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;<a href="' . htmlspecialchars('index.php?CMD[showExt]=' . $conflictK . '&CMD[remove]=1&CMD[clrCmd]=1&CMD[standAlone]=1&SET[singleDetails]=info') .
'" target="_blank">' . $this->removeButton() . '&nbsp;
' . $GLOBALS['LANG']->getLL('checkDependencies_remove_now') . '</a>';
$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" value="1" name="depsolver[ignore][' . $conflictK . ']" id="checkIgnore_' . $conflictK . '" />
<label for="checkIgnore_' . $conflictK . '">' . $GLOBALS['LANG']->getLL('checkDependencies_ignore_conflict') . '</label>';
$conflictError = true;
......
if (!isset($instExtInfo[$suggestK])) {
$msg[] = sprintf($GLOBALS['LANG']->getLL('checkDependencies_suggest_import'),
$suggestK);
$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;<img src="' . $GLOBALS['BACK_PATH'] .
$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;<a href="index.php?CMD[importExt]=' . $suggestK . '&CMD[loc]=L&CMD[standAlone]=1" target="_blank"><img src="' . $GLOBALS['BACK_PATH'] .
'gfx/import.gif" width="12" height="12" title="' . $GLOBALS['LANG']->getLL('checkDependencies_import_ext') . '" alt="" />&nbsp;
<a href="index.php?CMD[importExt]=' . $suggestK . '&CMD[loc]=L&CMD[standAlone]=1" target="_blank">' . $GLOBALS['LANG']->getLL('checkDependencies_import_now') . '</a>';
' . $GLOBALS['LANG']->getLL('checkDependencies_import_now') . '</a>';
$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" value="1" name="depsolver[ignore][' . $suggestK . ']" id="checkIgnore_' . $suggestK . '" />
<label for="checkIgnore_' . $suggestK . '">' . $GLOBALS['LANG']->getLL('checkDependencies_ignore_suggestion') . '</label>';
} else {
$msg[] = sprintf($GLOBALS['LANG']->getLL('checkDependencies_suggest_installation'),
$suggestK, $instExtInfo[$suggestK]['EM_CONF']['title']);
$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;' . $this->installButton() . '&nbsp;
<a href="' . htmlspecialchars('index.php?CMD[showExt]=' . $suggestK . '&CMD[load]=1&CMD[clrCmd]=1&CMD[standAlone]=1&SET[singleDetails]=info') .
'" target="_blank">' . $GLOBALS['LANG']->getLL('checkDependencies_install_now') . '</a>';
$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;<a href="' . htmlspecialchars('index.php?CMD[showExt]=' . $suggestK . '&CMD[load]=1&CMD[clrCmd]=1&CMD[standAlone]=1&SET[singleDetails]=info') .
'" target="_blank">' . $this->installButton() . '&nbsp;
' . $GLOBALS['LANG']->getLL('checkDependencies_install_now') . '</a>';
$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" value="1" name="depsolver[ignore][' . $suggestK . ']" id="checkIgnore_' . $suggestK . '" />
<label for="checkIgnore_' . $suggestK . '">' . $GLOBALS['LANG']->getLL('checkDependencies_ignore_suggestion') . '</label>';
}
......
}
}
if($suggestion || $suggestionIgnore) {
$content .= $this->doc->section(
$flashMessage = t3lib_div::makeInstance(
't3lib_FlashMessage',
sprintf($GLOBALS['LANG']->getLL('checkDependencies_exts_suggested_by_ext'), $extKey),
implode('<br />', $msg), 0, 1, 1
'',
t3lib_FlashMessage::NOTICE
);
$content .= '<br /><br />' . $flashMessage->render() . implode('<br />', $msg);
}
}
(1-1/2)