Index: typo3/sysext/scheduler/res/gfx/stop.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: typo3/sysext/scheduler/res/gfx/stop.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Index: typo3/sysext/scheduler/mod1/locallang.xml =================================================================== --- typo3/sysext/scheduler/mod1/locallang.xml (revision 6303) +++ typo3/sysext/scheduler/mod1/locallang.xml (working copy) @@ -59,6 +59,7 @@ The Scheduler was last started (%1$s) on %2$s at %3$s and ended on %4$s at %5$s. A running task may not be deleted. A running task may not be edited. + The task is not running. There are no executions to unmark. Please enter an email address No frequency was defined, either as an interval or as a cron command. The Scheduler has never yet run or the information about the last run has been lost. @@ -77,7 +78,9 @@ The backend user "_cli_scheduler" was found. The backend user "_cli_scheduler" exists but is currently disabled. The backend user "_cli_scheduler" was not found. <a href="%s" title="Click to create the missing user">Create the user now</a>. - The execution time of single execution tasks has to be in the future. + 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). + The task could not be marked as non-running. + The task was successfully marked as non-running. The requested task (UID: %d) was not found. The task was updated successfully. The task could not be updated. Index: typo3/sysext/scheduler/mod1/index.php =================================================================== --- typo3/sysext/scheduler/mod1/index.php (revision 6303) +++ typo3/sysext/scheduler/mod1/index.php (working copy) @@ -226,6 +226,10 @@ $this->deleteTask(); $content .= $this->listTasks(); break; + case 'stop': + $this->stopTask(); + $content .= $this->listTasks(); + break; case 'list': default: $content .= $this->listTasks(); @@ -530,6 +534,41 @@ } } + /** + * Clears the registered running executions from the task + * Note that this doesn't actually stop the running script. It just unmarks + * all executions. + * TODO: find a way to really kill the running task + * + * @return void + */ + protected function stopTask() { + try { + // Try to fetch the task and stop it + /** + * @var tx_scheduler_Task + */ + $task = $this->scheduler->fetchTask($this->submittedData['uid']); + if ($task->isExecutionRunning()) { + // If the task is indeed currently running, clear marked executions + + $result = $task->unmarkAllExecutions(); + if ($result) { + $this->addMessage($GLOBALS['LANG']->getLL('msg.stopSuccess')); + } else { + $this->addMessage($GLOBALS['LANG']->getLL('msg.stopError'), t3lib_FlashMessage::ERROR); + } + } else { + // The task is not running, nothing to unmark + + $this->addMessage($GLOBALS['LANG']->getLL('msg.maynotStopNonRunningTask'), t3lib_FlashMessage::WARNING); + } + } catch (Exception $e) { + // The task was not found, for some reason + $this->addMessage(sprintf($GLOBALS['LANG']->getLL('msg.taskNotFound'), $this->submittedData['uid']), t3lib_FlashMessage::ERROR); + } + } + /** * Return a form to add a new task or edit an existing one * @@ -925,6 +964,7 @@ // Define action icons $editAction = 'backPath, 'gfx/edit2.gif') . ' alt="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:edit') . '" /> '; $deleteAction = 'backPath, 'gfx/garbage.gif') . ' alt="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:delete') . '" />'; + $stopAction = 'backPath, t3lib_extMgm::extRelPath('scheduler') . '/res/gfx/stop.png') . ' alt="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:stop') . '" />'; // Define some default values $lastExecution = '-'; $isRunning = false; @@ -1011,7 +1051,7 @@ // Show no action links (edit, delete) if task is running $actions = $editAction . $deleteAction; if ($isRunning) { - $actions = ' '; + $actions = $stopAction; } // Check the disable status Index: typo3/sysext/scheduler/doc/manual.sxw =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: typo3/sysext/scheduler/class.tx_scheduler_task.php =================================================================== --- typo3/sysext/scheduler/class.tx_scheduler_task.php (revision 6303) +++ typo3/sysext/scheduler/class.tx_scheduler_task.php (working copy) @@ -405,6 +405,23 @@ $GLOBALS['TYPO3_DB']->sql_free_result($res); } + /** + * Clears all marked executions + * + * @return boolean True if the clearing succeeded, false otherwise + */ + public function unmarkAllExecutions() { + // Set the serialized executions field to empty + $result = $GLOBALS['TYPO3_DB']->exec_UPDATEquery( + 'tx_scheduler_task', + 'uid = ' . intval($this->taskUid), + array( + 'serialized_executions' => '' + ) + ); + return $result; + } + /** * Saves the details of the task to the database. *