Changeset 3167 for branches/2.2/workflow/inc/class.bo_agent_mail_smtp.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.bo_agent_mail_smtp.inc.php (modified) (9 diffs)

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

@@ -109 +109 @@
         {
                 parent::bo_agent();
-                $this->so_agent = CreateObject('workflow.so_agent_mail_smtp');
-                $this->bo_emailadmin = CreateObject('emailadmin.bo');
+                $this->so_agent = Factory::getInstance('so_agent_mail_smtp');
+                $this->bo_emailadmin = Factory::getInstance('bo');
                 //the showProcessConfigurationFields is not done here, quite harder to build
                 $this->ProcessConfigurationFieldsdefault = array(
@@ -312 +312 @@
         function init()
         {
-                $this->mail = CreateObject('phpgwapi.phpmailer');
+                $this->mail = Factory::getInstance('phpmailer');
                 //set the $this->conf
                 $this->getProcessConfigurationFields($this->activity->getProcessId());
@@ -466 +466 @@
                 }
 
-                $process = CreateObject('workflow.workflow_process');
+                $process = Factory::getInstance('workflow_process');
                 $process->getProcess($this->process_id);
                 $this->process_name = $process->getName();
@@ -637 +637 @@
                                         if ($this->process_name=='')
                                         {
-                                                $process = CreateObject('workflow.workflow_process');
+                                                $process = Factory::getInstance('workflow_process');
                                                 $process->getProcess($this->process_id);
                                                 $this->process_name = $process->getName();
@@ -648 +648 @@
                                         if ($this->process_version=='')
                                         {
-                                                $process = CreateObject('workflow.workflow_process');
+                                                $process = Factory::getInstance('workflow_process');
                                                 $process->getProcess($this->process_id);
                                                 $this->process_name = $process->getName();
@@ -674 +674 @@
                                         if (!is_object($this->account))
                                         {
-                                                $this->account = CreateObject('phpgwapi.accounts');
+                                                $this->account = Factory::getInstance('accounts');
                                         }
                                         $ask_user = $this->instance->getOwner();
@@ -683 +683 @@
                                         if (!is_object($this->role_manager))
                                         {
-                                                $this->role_manager = CreateObject('workflow.workflow_rolemanager');
+                                                $this->role_manager = Factory::getInstance('workflow_rolemanager');
                                         }
                                         if (!is_object($this->account))
                                         {
-                                                $this->account = CreateObject('phpgwapi.accounts');
+                                                $this->account = Factory::getInstance('accounts');
                                         }
                                         $my_subset = array('wf_activity_name' => $this->activity->getName());
@@ -718 +718 @@
                                                         if (!is_object($this->account))
                                                         {
-                                                                $this->account = CreateObject('phpgwapi.accounts');
+                                                                $this->account = Factory::getInstance('accounts');
                                                         }
                                                         $ask_user = $this->account->name2id($second_part);
@@ -731 +731 @@
                                                         if (!is_object($this->role_manager))
                                                         {
-                                                                $this->role_manager = CreateObject('workflow.workflow_rolemanager');
+                                                                $this->role_manager = Factory::getInstance('workflow_rolemanager');
                                                         }
                                                         if (!is_object($this->account))
                                                         {
-                                                                $this->account = CreateObject('phpgwapi.accounts');
+                                                                $this->account = Factory::getInstance('accounts');
                                                         }
                                                         $my_subset = array('wf_role_name' => $second_part);