Index: typo3/sysext/reports/ext_tables.php =================================================================== --- typo3/sysext/reports/ext_tables.php (revision 6436) +++ typo3/sysext/reports/ext_tables.php (working copy) @@ -18,9 +18,10 @@ $statusReport ); - $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['system'] = 'tx_reports_reports_status_SystemStatus'; - $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['security'] = 'tx_reports_reports_status_SecurityStatus'; - $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['configuration'] = 'tx_reports_reports_status_ConfigurationStatus'; + $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['typo3'][] = 'tx_reports_reports_status_Typo3Status'; + $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['system'][] = 'tx_reports_reports_status_SystemStatus'; + $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['security'][] = 'tx_reports_reports_status_SecurityStatus'; + $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['configuration'][] = 'tx_reports_reports_status_ConfigurationStatus'; $GLOBALS['TYPO3_CONF_VARS']['BE']['AJAX']['Reports::saveCollapseState'] = 'EXT:reports/reports/class.tx_reports_reports_status.php:tx_reports_reports_Status->saveCollapseState'; } Index: typo3/sysext/reports/reports/status/class.tx_reports_reports_status_typo3status.php =================================================================== --- typo3/sysext/reports/reports/status/class.tx_reports_reports_status_typo3status.php (revision 0) +++ typo3/sysext/reports/reports/status/class.tx_reports_reports_status_typo3status.php (revision 0) @@ -0,0 +1,70 @@ + +* All rights reserved +* +* This script is part of the TYPO3 project. The TYPO3 project is +* free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* The GNU General Public License can be found at +* http://www.gnu.org/copyleft/gpl.html. +* +* This script is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* This copyright notice MUST APPEAR in all copies of the script! +***************************************************************/ + + +/** + * Performs basic checks about the TYPO3 install + * + * @author Ingo Renner + * @package TYPO3 + * @subpackage reports + */ +class tx_reports_reports_status_Typo3Status implements tx_reports_StatusProvider { + + /** + * Returns the status for this report + * + * @see typo3/sysext/reports/interfaces/tx_reports_StatusProvider::getStatus() + */ + public function getStatus() { + $statuses = array( + 'Typo3Version' => $this->getTypo3VersionStatus(), + + ); + + return $statuses; + } + + /** + * Simply gets the current TYPO3 version. + * + * @return tx_reports_reports_status_Status + */ + protected function getTypo3VersionStatus() { + return t3lib_div::makeInstance('tx_reports_reports_status_Status', + 'TYPO3', + TYPO3_version, + '', + tx_reports_reports_status_Status::NOTICE + ); + } + +} + + +if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/reports/reports/status/class.tx_reports_reports_status_typo3status.php']) { + include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/reports/reports/status/class.tx_reports_reports_status_typo3status.php']); +} + +?> \ No newline at end of file Index: typo3/sysext/reports/reports/class.tx_reports_reports_status.php =================================================================== --- typo3/sysext/reports/reports/class.tx_reports_reports_status.php (revision 6436) +++ typo3/sysext/reports/reports/class.tx_reports_reports_status.php (working copy) @@ -52,8 +52,12 @@ $status = array(); $content = ''; - foreach ($this->statusProviders as $statusProviderId => $statusProvider) { - $status[$statusProviderId] = $statusProvider->getStatus(); + foreach ($this->statusProviders as $statusProviderId => $statusProvidersList) { + $status[$statusProviderId] = array(); + foreach ($statusProvidersList as $statusProvider) { + $statuses = $statusProvider->getStatus(); + $status[$statusProviderId] = array_merge($status[$statusProviderId], $statuses); + } } $content .= '

' @@ -69,10 +73,13 @@ * @return void */ protected function getStatusProviders() { - foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers'] as $key => $statusProvider) { - $statusProviderInstance = t3lib_div::makeInstance($statusProvider); - if ($statusProviderInstance instanceof tx_reports_StatusProvider) { - $this->statusProviders[$key] = $statusProviderInstance; + foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers'] as $key => $statusProvidersList) { + $this->statusProviders[$key] = array(); + foreach ($statusProvidersList as $statusProvider) { + $statusProviderInstance = t3lib_div::makeInstance($statusProvider); + if ($statusProviderInstance instanceof tx_reports_StatusProvider) { + $this->statusProviders[$key][] = $statusProviderInstance; + } } } } Index: typo3/sysext/reports/ext_autoload.php =================================================================== --- typo3/sysext/reports/ext_autoload.php (revision 6436) +++ typo3/sysext/reports/ext_autoload.php (working copy) @@ -10,6 +10,7 @@ 'tx_reports_report' => $extensionPath . 'interfaces/interface.tx_reports_report.php', 'tx_reports_module' => $extensionPath . 'mod/index.php', 'tx_reports_reports_status' => $extensionPath . 'reports/class.tx_reports_reports_status.php', + 'tx_reports_reports_status_typo3status' => $extensionPath . 'reports/status/class.tx_reports_reports_status_typo3status.php', 'tx_reports_reports_status_systemstatus' => $extensionPath . 'reports/status/class.tx_reports_reports_status_systemstatus.php', 'tx_reports_reports_status_securitystatus' => $extensionPath . 'reports/status/class.tx_reports_reports_status_securitystatus.php', 'tx_reports_reports_status_configurationstatus' => $extensionPath . 'reports/status/class.tx_reports_reports_status_configurationstatus.php', Index: typo3/sysext/install/ext_tables.php =================================================================== --- typo3/sysext/install/ext_tables.php (revision 6436) +++ typo3/sysext/install/ext_tables.php (working copy) @@ -4,7 +4,7 @@ if (TYPO3_MODE=='BE') { t3lib_extMgm::addModule('tools', 'install', '', t3lib_extMgm::extPath($_EXTKEY) . 'mod/'); - $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['typo3'] = 'tx_install_report_InstallStatus'; + $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['typo3'][] = 'tx_install_report_InstallStatus'; } ?> \ No newline at end of file Index: typo3/sysext/install/report/class.tx_install_report_installstatus.php =================================================================== --- typo3/sysext/install/report/class.tx_install_report_installstatus.php (revision 6436) +++ typo3/sysext/install/report/class.tx_install_report_installstatus.php (working copy) @@ -35,7 +35,7 @@ */ class tx_install_report_InstallStatus implements tx_reports_StatusProvider { - protected $reportList = 'Typo3Version,FileSystem,RemainingUpdates'; + protected $reportList = 'FileSystem,RemainingUpdates'; /** * Compiles a collection of system status checks as a status report. @@ -54,20 +54,6 @@ } /** - * Simply gets the current TYPO3 version. - * - * @return tx_reports_reports_status_Status - */ - protected function getTypo3VersionStatus() { - return t3lib_div::makeInstance('tx_reports_reports_status_Status', - 'TYPO3', - TYPO3_version, - '', - tx_reports_reports_status_Status::NOTICE - ); - } - - /** * Checks for several directoris being writable. * * @return unknown_type