Fixed bug #17068: Scheduler: Improve display of status and additional information
authorFrancois Suter <francois.suter@typo3.org>
Sun, 16 Jan 2011 19:39:54 +0000 (19:39 +0000)
committerFrancois Suter <francois.suter@typo3.org>
Sun, 16 Jan 2011 19:39:54 +0000 (19:39 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@10089 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/scheduler/mod1/index.php

index f5de99f..b177902 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2011-01-16  Francois Suter  <francois.suter@typo3.org>
 
        * Follow-up to #16966: Missing trailing comma in sliding fields list caused SQL error
+       * Fixed bug #17068: Scheduler: Improve display of status and additional information
 
 2011-01-15  Jigal van Hemert  <jigal@xs4all.nl>
 
index 8672bd0..822d727 100755 (executable)
@@ -999,7 +999,8 @@ class tx_scheduler_Module extends t3lib_SCbase {
                                '0'     => array(
                                        'tr'     => array('<tr class="t3-row-header">', '</tr>'),
                                        'defCol' => array('<td>', '</td>'),
-                                       '1'      => array('<td style="width: 36px;">', '</td>')
+                                       '1'      => array('<td style="width: 36px;">', '</td>'),
+                                       '3'              => array('<td colspan="2">', '</td>'),
                                ),
                                'defRow' => array(
                                        'tr'     => array('<tr class="db_list_normal">', '</tr>'),
@@ -1075,10 +1076,10 @@ class tx_scheduler_Module extends t3lib_SCbase {
                                if ($this->scheduler->isValidTaskObject($task)) {
                                        // The task object is valid
 
-                                       $name = $registeredClasses[$schedulerRecord['classname']]['title']. ' (' . $registeredClasses[$schedulerRecord['classname']]['extension'] . ')';
+                                       $name = htmlspecialchars($registeredClasses[$schedulerRecord['classname']]['title']. ' (' . $registeredClasses[$schedulerRecord['classname']]['extension'] . ')');
                                        $additionalInformation = $task->getAdditionalInformation();
                                        if (!empty($additionalInformation)) {
-                                               $name .= ' [' . $additionalInformation . ']';
+                                               $name .= '<br />[' . htmlspecialchars($additionalInformation) . ']';
                                        }
 
                                                // Check if task currently has a running execution
@@ -1156,12 +1157,13 @@ class tx_scheduler_Module extends t3lib_SCbase {
 
                                                // Format the execution status,
                                                // including failure feedback, if any
-                                       $executionStatusOutput = '<img ' . t3lib_iconWorks::skinImg(t3lib_extMgm::extRelPath('scheduler'), 'res/gfx/status_' . $executionStatus . '.png') . ' alt="' . htmlspecialchars($GLOBALS['LANG']->getLL('status.' . $executionStatus)) . '" title="' . htmlspecialchars($executionStatusDetail) . '" />' . $failureOutput . ' ' . htmlspecialchars($name);
+                                       $executionStatusOutput = '<img ' . t3lib_iconWorks::skinImg(t3lib_extMgm::extRelPath('scheduler'), 'res/gfx/status_' . $executionStatus . '.png') . ' alt="' . htmlspecialchars($GLOBALS['LANG']->getLL('status.' . $executionStatus)) . '" title="' . htmlspecialchars($executionStatusDetail) . '" />' . $failureOutput;
 
                                        $table[$tr][] = $startExecutionElement;
                                        $table[$tr][] = $actions;
                                        $table[$tr][] = $schedulerRecord['uid'];
                                        $table[$tr][] = $executionStatusOutput;
+                                       $table[$tr][] = $name;
                                        $table[$tr][] = $execType;
                                        $table[$tr][] = $frequency;
                                        $table[$tr][] = $multiple;