diff -ru reports_trunk/reports/locallang.xml reports/reports/locallang.xml
--- reports_trunk/reports/locallang.xml 2010-02-23 15:35:08.000000000 +0100
+++ reports/reports/locallang.xml 2010-03-24 18:15:06.000000000 +0100
@@ -13,6 +13,8 @@
+
+
@@ -42,6 +44,7 @@
+
\ Kein Zeilenumbruch am Dateiende.
diff -ru reports_trunk/reports/status/class.tx_reports_reports_status_securitystatus.php reports/reports/status/class.tx_reports_reports_status_securitystatus.php
--- reports_trunk/reports/status/class.tx_reports_reports_status_securitystatus.php 2010-03-25 09:29:35.000000000 +0100
+++ reports/reports/status/class.tx_reports_reports_status_securitystatus.php 2010-03-24 18:18:19.000000000 +0100
@@ -248,19 +248,49 @@
$enableInstallToolFileExists = is_file($enableInstallToolFile);
- if ($enableInstallToolFileExists && trim(file_get_contents($enableInstallToolFile)) === 'KEEP_FILE') {
- $value = $GLOBALS['LANG']->getLL('status_enabled');
- $severity = tx_reports_reports_status_Status::WARNING;
-
- $disableInstallToolUrl = t3lib_div::getIndpEnv('TYPO3_REQUEST_URL')
- . '&adminCmd=remove_ENABLE_INSTALL_TOOL';
-
- $message = sprintf(
- $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:warning.install_enabled'),
- '' . $enableInstallToolFile . '');
- $message .= ' '
- . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:warning.install_enabled_cmd')
- . '';
+ if ($enableInstallToolFileExists) {
+
+ if (trim(file_get_contents($enableInstallToolFile)) === 'KEEP_FILE') {
+
+ $severity = tx_reports_reports_status_Status::WARNING;
+
+ $disableInstallToolUrl = t3lib_div::getIndpEnv('TYPO3_REQUEST_URL')
+ . '&adminCmd=remove_ENABLE_INSTALL_TOOL';
+
+ $value = $GLOBALS['LANG']->getLL('status_enabledPermanently');
+
+ $message = sprintf(
+ $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:warning.install_enabled'),
+ '' . $enableInstallToolFile . '');
+ $message .= ' '
+ . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:warning.install_enabled_cmd')
+ . '';
+
+ } else {
+
+ $enableInstallToolFileTtl = filemtime($enableInstallToolFile) + 3600 - time();
+
+ if ($enableInstallToolFileTtl <= 0) {
+
+ unlink($enableInstallToolFile);
+
+ } else {
+
+ $severity = tx_reports_reports_status_Status::NOTICE;
+
+ $disableInstallToolUrl = t3lib_div::getIndpEnv('TYPO3_REQUEST_URL')
+ . '&adminCmd=remove_ENABLE_INSTALL_TOOL';
+
+ $value = $GLOBALS['LANG']->getLL('status_enabledTemporarily');
+
+ $message = sprintf(
+ $GLOBALS['LANG']->getLL('status_installEnabledTemporarily'),
+ '' . $enableInstallToolFile . '', floor($enableInstallToolFileTtl/60) );
+ $message .= ' '
+ . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:warning.install_enabled_cmd')
+ . '';
+ }
+ }
}
return t3lib_div::makeInstance('tx_reports_reports_status_Status',