Project

General

Profile

Download (10.1 KB)

Feature #23259 » bug-15219-v2.diff

Administrator Admin, 2010-07-24 00:14

View differences:

typo3/sysext/lang/locallang_mod_tools_em.xml (working copy)
<label index="security_header">Found a security problem? Please get in touch with us!</label>
<label index="security_warning_extensions">Please be aware that extensions are third-party software. Installing an extension is a security risk, as the high level of quality and security in the TYPO3 Core can not be assured in these extensions.</label>
<label index="security_descr">If you think you have found a security issue in TYPO3 or an extension, please contact the %sTYPO3 security team%s! Thank you!</label>
<label index="menu_loaded_extensions">Loaded extensions</label>
<label index="menu_install_extensions">Install extensions</label>
<label index="menu_manage_extensions">Manage extensions</label>
<label index="menu_import_extensions">Import extensions</label>
<label index="menu_translation_handling">Translation handling</label>
<label index="menu_settings">Settings</label>
......
<label index="display_shy">Display shy extensions:</label>
<label index="only_my_ext">Only my extensions:</label>
<label index="show_obsolete">Show obsolete:</label>
<label index="filter_installed">Only installed:</label>
<label index="go_back">Go back</label>
<label index="look_up">Look up:</label>
<label index="loaded_exts">Loaded Extensions</label>
typo3/sysext/em/mod1/class.em_index.php (working copy)
* 584: function printContent()
*
* SECTION: Function Menu Applications
* 609: function extensionList_loaded()
* 664: function extensionList_installed()
* 735: function extensionList()
* 736: function extensionList_import()
* 903: function alterSettings()
*
......
// MENU-ITEMS:
$this->MOD_MENU = array(
'function' => array(
0 => $GLOBALS['LANG']->getLL('menu_loaded_extensions'),
1 => $GLOBALS['LANG']->getLL('menu_install_extensions'),
2 => $GLOBALS['LANG']->getLL('menu_import_extensions'),
4 => $GLOBALS['LANG']->getLL('menu_translation_handling'),
0 => $GLOBALS['LANG']->getLL('menu_manage_extensions'),
1 => $GLOBALS['LANG']->getLL('menu_import_extensions'),
2 => $GLOBALS['LANG']->getLL('menu_translation_handling'),
3 => $GLOBALS['LANG']->getLL('menu_settings'),
5 => $GLOBALS['LANG']->getLL('menu_extension_updates'),
4 => $GLOBALS['LANG']->getLL('menu_extension_updates'),
),
'listOrder' => array(
'cat' => $GLOBALS['LANG']->getLL('list_order_category'),
......
'display_own' => '',
'display_obsolete' => '',
'display_installed' => '',
'filter_installed' => '',
'display_files' => '',
......
// CLEANSE SETTINGS
$this->MOD_SETTINGS = t3lib_BEfunc::getModuleData($this->MOD_MENU, t3lib_div::_GP('SET'), $this->MCONF['name']);
if ($this->MOD_SETTINGS['function']==2) {
if ($this->MOD_SETTINGS['function']==1) {
// If listing from online repository, certain items are removed though:
unset($this->MOD_MENU['listOrder']['type']);
unset($this->MOD_MENU['display_details'][2]);
......
} elseif ($this->CMD['importExtInfo']) { // Gets detailed information of an extension from online rep.
$this->importExtInfo($this->CMD['importExtInfo'],$this->CMD['extVersion']);
} else { // No command - we show what the menu setting tells us:
if (t3lib_div::inList('0,1,2',$this->MOD_SETTINGS['function'])) {
if (t3lib_div::inList('0,1',$this->MOD_SETTINGS['function'])) {
$menu .= '&nbsp;' . $GLOBALS['LANG']->getLL('group_by') . '&nbsp;' . t3lib_BEfunc::getFuncMenu(0, 'SET[listOrder]', $this->MOD_SETTINGS['listOrder'], $this->MOD_MENU['listOrder']) .
'&nbsp;&nbsp;' . $GLOBALS['LANG']->getLL('show') . '&nbsp;' . t3lib_BEfunc::getFuncMenu(0, 'SET[display_details]', $this->MOD_SETTINGS['display_details'], $this->MOD_MENU['display_details']) . '<br />';
}
if (t3lib_div::inList('0,1,5',$this->MOD_SETTINGS['function'])) {
if (t3lib_div::inList('0,4',$this->MOD_SETTINGS['function'])) {
$menu.='<label for="checkDisplayShy">' . $GLOBALS['LANG']->getLL('display_shy') . '</label>&nbsp;&nbsp;' . t3lib_BEfunc::getFuncCheck(0, 'SET[display_shy]', $this->MOD_SETTINGS['display_shy'], '', '', 'id="checkDisplayShy"');
}
if (t3lib_div::inList('2',$this->MOD_SETTINGS['function']) && strlen($this->fe_user['username'])) {
if (t3lib_div::inList('1',$this->MOD_SETTINGS['function']) && strlen($this->fe_user['username'])) {
$menu.='<label for="checkDisplayOwn">' . $GLOBALS['LANG']->getLL('only_my_ext') . '</label>&nbsp;&nbsp;' . t3lib_BEfunc::getFuncCheck(0, 'SET[display_own]', $this->MOD_SETTINGS['display_own'], '', '', 'id="checkDisplayOwn"');
}
if (t3lib_div::inList('0,1,2',$this->MOD_SETTINGS['function'])) {
if (t3lib_div::inList('0,1',$this->MOD_SETTINGS['function'])) {
$menu.='&nbsp;&nbsp;<label for="checkDisplayObsolete">' . $GLOBALS['LANG']->getLL('show_obsolete') . '</label>&nbsp;&nbsp;' . t3lib_BEfunc::getFuncCheck(0, 'SET[display_obsolete]', $this->MOD_SETTINGS['display_obsolete'], '', '', 'id="checkDisplayObsolete"');
}
if (t3lib_div::inList('0', $this->MOD_SETTINGS['function'])) {
$menu .= '&nbsp;&nbsp;<label for="checkFilterInstalled">' . $GLOBALS['LANG']->getLL('filter_installed') . '</label>&nbsp;&nbsp;' . t3lib_BEfunc::getFuncCheck(0, 'SET[filter_installed]', $this->MOD_SETTINGS['filter_installed'], '', '', 'id="checkFilterInstalled"');
}
$this->content.=$this->doc->section('','<form action="index.php" method="post" name="pageform"><span class="nobr">' . ($menu ? $menu : '&nbsp;') . '</span></form>');
$this->content.=$this->doc->spacer(10);
switch((string)$this->MOD_SETTINGS['function']) {
case '0':
// Lists loaded (installed) extensions
$this->extensionList_loaded();
// Lists the filtered extensions
$this->extensionList();
break;
case '1':
// Lists the installed (available) extensions
$this->extensionList_installed();
break;
case '2':
// Lists the extensions available from online rep.
$this->extensionList_import();
break;
case '3':
case '2':
// Shows the settings screen
$this->alterSettings();
break;
case '4':
case '3':
// Allows to set the translation preferences and check the status
$this->translationHandling();
break;
case '5':
case '4':
// Shows a list of extensions with updates in TER
$this->checkForUpdates();
break;
......
*********************************/
/**
* Listing of loaded (installed) extensions
*
* @return void
*/
function extensionList_loaded() {
global $TYPO3_LOADED_EXT;
list($list,$cat) = $this->getInstalledExtensions();
// Loaded extensions
$content = '';
$lines = array();
// Available extensions
if (is_array($cat[$this->MOD_SETTINGS['listOrder']])) {
$content='';
$lines=array();
$lines[] = $this->extensionListRowHeader(' class="t3-row-header"',array('<td><img src="clear.gif" width="1" height="1" alt="" /></td>'));
foreach($cat[$this->MOD_SETTINGS['listOrder']] as $catName => $extEkeys) {
natcasesort($extEkeys);
$extensions = array();
foreach ($extEkeys as $extKey => $value) {
if (array_key_exists($extKey,$TYPO3_LOADED_EXT) && ($this->MOD_SETTINGS['display_shy'] || !$list[$extKey]['EM_CONF']['shy']) && $this->searchExtension($extKey,$list[$extKey])) {
if (in_array($extKey, $this->requiredExt)) {
$loadUnloadLink = '<strong>' . $GLOBALS['TBE_TEMPLATE']->rfw($GLOBALS['LANG']->getLL('extension_required_short')) . '</strong>';
} else {
$loadUnloadLink = '<a href="'.htmlspecialchars('index.php?CMD[showExt]='.$extKey.'&CMD[remove]=1').'">'.$this->removeButton().'</a>';
}
$extensions[] = $this->extensionListRow($extKey,$list[$extKey],array('<td class="bgColor">'.$loadUnloadLink.'</td>'));
}
}
if(count($extensions)) {
$lines[]='<tr><td colspan="'.(3+$this->detailCols[$this->MOD_SETTINGS['display_details']]).'"><br /></td></tr>';
$lines[]='<tr><td colspan="'.(3+$this->detailCols[$this->MOD_SETTINGS['display_details']]).'">' . t3lib_iconWorks::getSpriteIcon('apps-filetree-folder-default') . '<strong>'.htmlspecialchars($this->listOrderTitle($this->MOD_SETTINGS['listOrder'],$catName)).'</strong></td></tr>';
$lines[] = implode(LF,$extensions);
}
}
}
$content.= t3lib_BEfunc::cshItem('_MOD_tools_em', 'loaded', $GLOBALS['BACK_PATH'],'');
$content.= '<form action="index.php" method="post" name="lookupform">';
$content.= '<label for="lookUp">' . $GLOBALS['LANG']->getLL('look_up') . '</label> <input type="text" id="lookUp" name="lookUp" value="' . htmlspecialchars($this->lookUpStr) . '" /><input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:search') . '" /><br /><br />';
$content.= '</form>
<!-- Loaded Extensions List -->
<table border="0" cellpadding="2" cellspacing="1">'.implode('',$lines).'</table>';
$this->content.=$this->doc->section($GLOBALS['LANG']->getLL('loaded_exts'),$content,0,1);
}
/**
* Listing of available (installed) extensions
*
* @return void
*/
function extensionList_installed() {
function extensionList() {
global $TYPO3_LOADED_EXT;
list($list,$cat)=$this->getInstalledExtensions();
......
natcasesort($extEkeys);
$extensions = array();
foreach ($extEkeys as $extKey => $value) {
if ($this->MOD_SETTINGS['filter_installed'] && !array_key_exists($extKey, $TYPO3_LOADED_EXT)) continue;
$allKeys[]=$extKey;
if ((!$list[$extKey]['EM_CONF']['shy'] || $this->MOD_SETTINGS['display_shy']) &&
($list[$extKey]['EM_CONF']['state']!='obsolete' || $this->MOD_SETTINGS['display_obsolete'])
(5-5/5)