Changeset 3167 for branches/2.2/workflow/inc/class.JobRunner.inc.php

Timestamp:

08/17/10 16:17:12 (14 years ago)

Author:

viani

Message:

Ticket #1135 - Merged r1990:3166 from /trunk/workflow into /branches/2.2/workflow

File:

• branches/2.2/workflow/inc/class.JobRunner.inc.php (modified) (3 diffs)

branches/2.2/workflow/inc/class.JobRunner.inc.php

@@ -43 +43 @@
                 $this->parameters = unserialize(base64_decode($parameters));
                 $this->parameters['currentDate'] = new DateTime($this->parameters['currentDate']);
-                $this->jobManager = &$GLOBALS['workflow']['factory']->getInstance('WorkflowJobManager');
+                $this->jobManager =& Factory::getInstance('WorkflowJobManager');
         }
 
@@ -66 +66 @@
         {
                 /* activate the security policy */
-                $GLOBALS['workflow']['factory']->getInstance('WorkflowSecurity')->enableSecurityPolicy();
+                Factory::getInstance('WorkflowSecurity')->enableSecurityPolicy();
+
+                /**
+                 * Since all jobs must run in process mode, e. g. it's user code,
+                 * we must enable the security.
+                 */
+                Security::enable();
 
                 if (!file_exists($this->parameters['file']))
@@ -94 +100 @@
 
 require_once 'common.inc.php';
-$GLOBALS['workflow']['factory']->getInstance('WorkflowMacro')->prepareEnvironment();
+Factory::getInstance('WorkflowMacro')->prepareEnvironment();
 
-$jobRunner = new JobRunner($argv[1]);
+$jobRunner = &Factory::newInstance('JobRunner', $argv[1]);
 $jobRunner->run();
 ?>