diff --git a/typo3/sysext/em/classes/index.php b/typo3/sysext/em/classes/index.php index eedea4895773d6f5de437f0e2df1bc8e4d3a9eca..2439855debcd8dfdd3df943c7ec62c357235d461 100644 --- a/typo3/sysext/em/classes/index.php +++ b/typo3/sysext/em/classes/index.php @@ -2571,7 +2571,7 @@ class SC_mod_tools_em_index extends t3lib_SCbase { $GLOBALS['LANG']->getLL('ext_import_close_check') . '</a>'; return $link; } else { - return '<a id="closewindow" href="javascript:if (parent.TYPO3.EM) {parent.TYPO3.EM.Tools.closeImportWindow();} else {window.close();}">' . $GLOBALS['LANG']->getLL('ext_import_close') . '</a>'; + return '<a id="closewindow" href="javascript:if (parent.TYPO3.EM && top.frames.length) {parent.TYPO3.EM.Tools.closeImportWindow();} else {window.close();}">' . $GLOBALS['LANG']->getLL('ext_import_close') . '</a>'; } } diff --git a/typo3/sysext/em/classes/install/class.tx_em_install.php b/typo3/sysext/em/classes/install/class.tx_em_install.php index d2a50ba970e4574a8356d0cd67fc58f716824ad0..f3dc9639f86a3b242f81b193a310196589187d5d 100644 --- a/typo3/sysext/em/classes/install/class.tx_em_install.php +++ b/typo3/sysext/em/classes/install/class.tx_em_install.php @@ -493,25 +493,25 @@ class tx_em_Install { $msg[] = '<br />' . sprintf($GLOBALS['LANG']->getLL('checkDependencies_ext_not_available'), $depK); $msg[] = ' ' . t3lib_iconWorks::getSpriteIcon('actions-system-extension-import', array('title' => $GLOBALS['LANG']->getLL('checkDependencies_import_ext'))) . ' - <a href="' . t3lib_div::linkThisUrl($this->parentObject->script, array( + <a href="#" onclick="window.open(\'' . t3lib_div::linkThisUrl($this->parentObject->script, array( 'CMD[importExt]' => $depK, 'CMD[loc]' => 'L', 'CMD[standAlone]' => 1 - )) . '" target="_blank">' . $GLOBALS['LANG']->getLL('checkDependencies_import_now') . '</a>'; + )) . '\', \'' . md5($instExtInfo[$depK]['EM_CONF']['title']) . '\', \'width=650, height=500\'); return false;" target="_blank">' . $GLOBALS['LANG']->getLL('checkDependencies_import_now') . '</a>'; $msg[] = ' <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[] = ' ' . tx_em_Tools::installButton() . ' - <a href="' . t3lib_div::linkThisUrl($this->parentObject->script, array( + <a href="#" onclick="window.open(\'' . t3lib_div::linkThisUrl($this->parentObject->script, array( 'CMD[showExt]' => $depK, 'CMD[load]' => 1, 'CMD[clrCmd]' => 1, 'CMD[standAlone]' => 1, 'SET[singleDetails]' => 'info' )) . - '" target="_blank">' . $GLOBALS['LANG']->getLL('checkDependencies_install_now') . '</a>'; + '\', \'' . md5($instExtInfo[$depK]['EM_CONF']['title']) . '\', \'width=650, height=500\'); return false; " target="_blank">' . $GLOBALS['LANG']->getLL('checkDependencies_install_now') . '</a>'; $msg[] = ' <input type="checkbox" value="1" name="depsolver[ignore][' . $depK . ']" id="checkIgnore_' . $depK . '" /> <label for="checkIgnore_' . $depK . '">' . $GLOBALS['LANG']->getLL('checkDependencies_ignore_ext_requirement') . '</label>'; } @@ -607,25 +607,25 @@ class tx_em_Install { $msg[] = sprintf($GLOBALS['LANG']->getLL('checkDependencies_suggest_import'), $suggestK); $msg[] = ' ' . t3lib_iconWorks::getSpriteIcon('actions-system-extension-import', array('title' => $GLOBALS['LANG']->getLL('checkDependencies_import_ext'))) . ' - <a href="' . t3lib_div::linkThisScript(array( + <a href="#" onclick="window.open(\'' . t3lib_div::linkThisScript(array( 'CMD[importExt]' => $suggestK, 'CMD[loc]' => 'L', 'CMD[standAlone]' => 1 - )) . '" target="_blank">' . $GLOBALS['LANG']->getLL('checkDependencies_import_now') . '</a>'; + )) . '\', \'' . md5($suggestK) . '\', \'width=650, height=500\'); return false; " target="_blank">' . $GLOBALS['LANG']->getLL('checkDependencies_import_now') . '</a>'; $msg[] = ' <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[] = ' ' . tx_em_Tools::installButton() . ' - <a href="' . htmlspecialchars(t3lib_div::linkThisScript(array( + <a href="#" onclick="window.open(\'' . htmlspecialchars(t3lib_div::linkThisScript(array( 'CMD[showExt]' => $suggestK, 'CMD[load]' => 1, 'CMD[clrCmd]' => 1, 'CMD[standAlone]' => 1, 'SET[singleDetails]' => 'info' ))) . - '" target="_blank">' . $GLOBALS['LANG']->getLL('checkDependencies_install_now') . '</a>'; + '\', \'' . md5($suggestK) . '\', \'width=650, height=500\'); return false; " target="_blank">' . $GLOBALS['LANG']->getLL('checkDependencies_install_now') . '</a>'; $msg[] = ' <input type="checkbox" value="1" name="depsolver[ignore][' . $suggestK . ']" id="checkIgnore_' . $suggestK . '" /> <label for="checkIgnore_' . $suggestK . '">' . $GLOBALS['LANG']->getLL('checkDependencies_ignore_suggestion') . '</label>'; }