Changeset 2338 for sandbox/workflow/branches

Timestamp:

03/24/10 15:22:16 (14 years ago)

Author:

pedroerp

Message:

Ticket #609 - Corrigindo o uso da factory em vários arquivos.

Location:

sandbox/workflow/branches/609

Files:

• inc/class.JobRunner.inc.php (modified) (1 diff)
• inc/class.WorkflowUtils.inc.php (modified) (1 diff)
• inc/class.bo_monitors.inc.php (modified) (1 diff)
• inc/class.ui_adminprocesses.inc.php (modified) (1 diff)
• inc/class.workflow_processmanager.inc.php (modified) (1 diff)
• inc/common.inc.php (modified) (1 diff)
• inc/hook_home.inc.php (modified) (1 diff)
• lib/factory/WorkflowFactory.php (modified) (1 diff)

sandbox/workflow/branches/609/inc/class.JobRunner.inc.php

@@ -68 +68 @@
                 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']))
                         $this->fail('Arquivo contendo o código do Job não foi encontrado');

sandbox/workflow/branches/609/inc/class.WorkflowUtils.inc.php

@@ -1 +1 @@
 <?php
+        require_once 'common.inc.php';
+
         //set here the global DEBUG level which is actually 0 (nothing) or 1 (all)
         if (!defined('_DEBUG')) define('_DEBUG', 0);

sandbox/workflow/branches/609/inc/class.bo_monitors.inc.php

@@ -11 +11 @@
 
 require_once('class.bo_ajaxinterface.inc.php');
+
+
+/**
+ * DO NOT remove this line. Ever. Somehow, monitors interface will stop working..
+ */
+require_once(PHPGW_API_INC . SEP . 'common_functions.inc.php');
+
 
 /**

sandbox/workflow/branches/609/inc/class.ui_adminprocesses.inc.php

@@ -1 +1 @@
 <?php
+require_once 'common.inc.php';
 require_once(dirname(__FILE__) . SEP . 'class.bo_workflow_forms.inc.php');
 require_once('engine' . SEP . 'config.egw.inc.php');

sandbox/workflow/branches/609/inc/class.workflow_processmanager.inc.php

@@ -33 +33 @@
                 {
                         parent::ProcessManager();
-                        $this->workflow_acl = Factory::getInstace('workflow_acl');
+                        $this->workflow_acl = Factory::getInstance('workflow_acl');
 
                         /* allow regular users to see the process graph */

sandbox/workflow/branches/609/inc/common.inc.php

@@ -10 +10 @@
 \**************************************************************************/
 
-
 /**
  * Server base path. This constant is somewhat simililar to
  * 'PHPGW_SERVER_ROOT'. Nevertheless, there are cases that we
  * access Workflow directly and it must be defined somewhere.
+ * Recently discovered, when we are runnnig jobs HTTP_SERVER_VARS
+ * exported by apache are not available.
+ * Therefore, we are using this workaround here, setting
+ * EGW_SERVER_ROOT based on the location of this file. This constant
+ * should be updated properly every time we move this file.
  * @name EGW_SERVER_ROOT
  */
-define('EGW_SERVER_ROOT', $GLOBALS['HTTP_SERVER_VARS']['DOCUMENT_ROOT']);
+define('EGW_SERVER_ROOT', dirname(dirname(dirname(__FILE__))));
+//define('EGW_SERVER_ROOT', $GLOBALS['HTTP_SERVER_VARS']['DOCUMENT_ROOT']);
 
 /**

sandbox/workflow/branches/609/inc/hook_home.inc.php

@@ -1 +1 @@
 <?php
+require_once 'common.inc.php';
+
 $GLOBALS['phpgw_info']['flags']['currentapp'] = "workflow";
 if (!isset($_SESSION['phpgw_info']['workflow']['server']))

sandbox/workflow/branches/609/lib/factory/WorkflowFactory.php

@@ -80 +80 @@
                 $this->registerFileInfo('workflow_instance', 'class.workflow_instance.inc.php', 'inc');
 
+                $this->registerFileInfo('bo_monitors', 'class.bo_monitors.inc.php', 'inc');
+                $this->registerFileInfo('bo_adminaccess', 'class.bo_adminaccess.inc.php', 'inc');
                 $this->registerFileInfo('bo_userinterface', 'class.bo_userinterface.inc.php', 'inc');
                 $this->registerFileInfo('bo_participants', 'class.bo_participants.inc.php', 'inc');