Feature #12215: Scheduler: Added display and information about usage of timezone

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@6335 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index b2ab79a..9c2ebf7 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-05  Francois Suter  <francois@typo3.org>
+
+       * Feature #12215: Scheduler: Added display and information about usage of timezone
+
 2009-11-05  Rupert Germann  <rupi@gmx.li>
 
        * Fixed bug #12466: PHP-5.3 Warning: strlen() expects parameter 1 to be string, array given

diff --git a/typo3/sysext/scheduler/doc/manual.sxw b/typo3/sysext/scheduler/doc/manual.sxw
index f20a2a2..3668737 100644 (file)
Binary files a/typo3/sysext/scheduler/doc/manual.sxw and b/typo3/sysext/scheduler/doc/manual.sxw differ

diff --git a/typo3/sysext/scheduler/mod1/index.php b/typo3/sysext/scheduler/mod1/index.php
index d087f33..6a375f6 100755 (executable)
--- a/typo3/sysext/scheduler/mod1/index.php
+++ b/typo3/sysext/scheduler/mod1/index.php
@@ -498,6 +498,23 @@ class tx_scheduler_Module extends t3lib_SCbase {
                return $content;
        }
 
+       /**
+        * Display the current server's time along with a help text about server time
+        * usage in the Scheduler
+        *
+        * @return      string  HTML to display
+        */
+       protected function displayServerTime() {
+                       // Get the current time, formatted
+               $dateFormat = $GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'] . ' ' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['hhmm'] . ' T (e)';
+               $now = date($dateFormat);
+                       // Display the help text
+               $serverTime  = '<h4>' . $GLOBALS['LANG']->getLL('label.serverTime') . '</h4>';
+               $serverTime .= '<p>' . $GLOBALS['LANG']->getLL('msg.serverTimeHelp') . '</p>';
+               $serverTime .= '<p>' . sprintf($GLOBALS['LANG']->getLL('msg.serverTime'), $now) . '</p>';
+               return $serverTime;
+       }
+
        /**
         * Delete a task from the execution queue
         *
@@ -830,6 +847,9 @@ class tx_scheduler_Module extends t3lib_SCbase {
                $content .= '<input type="submit" name="save" class="button" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:save') . '" /> '
                        . '<input type="button" name="cancel" class="button" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:cancel') . '" onclick="document.location=\'' . $GLOBALS['MCONF']['_'] . '\'" />';
 
+                       // Display information about server time usage
+               $content .= $this->displayServerTime();
+
                return $content;
        }
 
@@ -1117,8 +1137,9 @@ class tx_scheduler_Module extends t3lib_SCbase {
                        . '" /> ' . $GLOBALS['LANG']->getLL('action.add') . '</a></p>';
 
                        // Display legend, if there's at least one registered task
+                       // Also display information about the usage of server time
                if ($numRows > 0) {
-                       $content .= '<p class="status-legend">' . $GLOBALS['LANG']->getLL('status.legend') . ':</p>
+                       $content .= '<h4>' . $GLOBALS['LANG']->getLL('status.legend') . '</h4>
                        <ul>
                                <li><img ' . t3lib_iconWorks::skinImg(t3lib_extMgm::extRelPath('scheduler'), 'res/gfx/status_failure.png') . ' alt="' . $GLOBALS['LANG']->getLL('status.failure') . '" /> ' . $GLOBALS['LANG']->getLL('status.legend.failure') . '</li>
                                <li><img ' . t3lib_iconWorks::skinImg(t3lib_extMgm::extRelPath('scheduler'), 'res/gfx/status_late.png') . ' alt="' . $GLOBALS['LANG']->getLL('status.late') . '" /> ' . $GLOBALS['LANG']->getLL('status.legend.late') . '</li>
@@ -1126,6 +1147,7 @@ class tx_scheduler_Module extends t3lib_SCbase {
                                <li><img ' . t3lib_iconWorks::skinImg(t3lib_extMgm::extRelPath('scheduler'), 'res/gfx/status_scheduled.png') . ' alt="' . $GLOBALS['LANG']->getLL('status.scheduled') . '" /> ' . $GLOBALS['LANG']->getLL('status.legend.scheduled') . '</li>
                                <li><img ' . t3lib_iconWorks::skinImg(t3lib_extMgm::extRelPath('scheduler'), 'res/gfx/status_disabled.png') . ' alt="' . $GLOBALS['LANG']->getLL('status.disabled') . '" /> ' . $GLOBALS['LANG']->getLL('status.legend.disabled') . '</li>
                        </ul>';
+                       $content .= $this->displayServerTime();
                }
 
 

diff --git a/typo3/sysext/scheduler/mod1/locallang.xml b/typo3/sysext/scheduler/mod1/locallang.xml
index d19111c..058ea05 100644 (file)
--- a/typo3/sysext/scheduler/mod1/locallang.xml
+++ b/typo3/sysext/scheduler/mod1/locallang.xml
@@ -37,6 +37,7 @@
                        <label index="label.nextExecution">Next Execution</label>
                        <label index="label.parallel">Parallel Execution</label>
                        <label index="label.parallel.long">Allow Parallel Execution</label>
+                       <label index="label.serverTime">Server time</label>
                        <label index="label.sleepTime">Sleep time</label>
                        <label index="label.start">Start (HH:MM DD-MM-YYYY)</label>
                        <label index="label.type">Type</label>
@@ -78,6 +79,8 @@
                        <label index="msg.schedulerUserFound">The backend user "_cli_scheduler" was found.</label>
                        <label index="msg.schedulerUserFoundButDisabled">The backend user "_cli_scheduler" exists but is currently disabled.</label>
                        <label index="msg.schedulerUserMissing">The backend user "_cli_scheduler" was not found. &lt;a href="%s" title="Click to create the missing user"&gt;Create the user now&lt;/a&gt;.</label>
+                       <label index="msg.serverTime">Current server time is %s.</label>
+                       <label index="msg.serverTimeHelp">All dates and times in the Scheduler are measured according to the server's time, as the Scheduler is run purely on the server-side.</label>
                        <label index="msg.stop">Are you sure you want to mark this task as not running? Note that this will not stop the actual script (if unsure please refer to the manual).</label>
                        <label index="msg.stopError">The task could not be marked as non-running.</label>
                        <label index="msg.stopSuccess">The task was successfully marked as non-running.</label>

diff --git a/typo3/sysext/scheduler/mod1/locallang_csh_scheduler.xml b/typo3/sysext/scheduler/mod1/locallang_csh_scheduler.xml
index 039fdda..157f56f 100644 (file)
--- a/typo3/sysext/scheduler/mod1/locallang_csh_scheduler.xml
+++ b/typo3/sysext/scheduler/mod1/locallang_csh_scheduler.xml
@@ -33,11 +33,13 @@
                        <label index="task_start.description">Enter a start date and time for the task</label>
                        <label index="task_start.details">
                                Date must be entered in a standard format like HH:mm dd-mm-YYYY or YYYY-mm-dd HH:mm. Natural keywords can also be used, like "now" or "tomorrow".
+                               Date and time must correspond to the server's time zone.
                        </label>
                        <label index="task_end.alttitle">Start of task</label>
                        <label index="task_end.description">Enter an end date and time for the task, can be blank</label>
                        <label index="task_end.details">
                                Date must be entered in a standard format like HH:mm dd-mm-YYYY or YYYY-mm-dd HH:mm. Natural keywords can also be used, like "now" or "tomorrow".
+                               Date and time must correspond to the server's time zone.
 
                                Can be left blank, if task is not supposed to end at any point.
                        </label>