- Timestamp:
- 03/15/10 16:00:11 (14 years ago)
- Location:
- sandbox/workflow/branches/609
- Files:
-
- 25 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/workflow/branches/609/inc/class.WorkflowUtils.inc.php
r2233 r2253 359 359 function export() 360 360 { 361 $this->process_manager = CreateObject('workflow.workflow_processmanager');361 $this->process_manager = Factory::getInstance('workflow_processmanager'); 362 362 363 363 // retrieve process info -
sandbox/workflow/branches/609/inc/class.bo_agent.inc.php
r795 r2253 278 278 if (!(isset($this->process))) 279 279 { 280 $this->process = CreateObject('workflow.workflow_process');280 $this->process = Factory::getInstance('workflow_process'); 281 281 $this->process->getProcess($wf_p_id); 282 282 } -
sandbox/workflow/branches/609/inc/class.bo_agent_mail_smtp.inc.php
r795 r2253 109 109 { 110 110 parent::bo_agent(); 111 $this->so_agent = CreateObject('workflow.so_agent_mail_smtp');111 $this->so_agent = Factory::getInstance('so_agent_mail_smtp'); 112 112 $this->bo_emailadmin = CreateObject('emailadmin.bo'); 113 113 //the showProcessConfigurationFields is not done here, quite harder to build … … 466 466 } 467 467 468 $process = CreateObject('workflow.workflow_process');468 $process = Factory::getInstance('workflow_process'); 469 469 $process->getProcess($this->process_id); 470 470 $this->process_name = $process->getName(); … … 637 637 if ($this->process_name=='') 638 638 { 639 $process = CreateObject('workflow.workflow_process');639 $process = Factory::getInstance('workflow_process'); 640 640 $process->getProcess($this->process_id); 641 641 $this->process_name = $process->getName(); … … 648 648 if ($this->process_version=='') 649 649 { 650 $process = CreateObject('workflow.workflow_process');650 $process = Factory::getInstance('workflow_process'); 651 651 $process->getProcess($this->process_id); 652 652 $this->process_name = $process->getName(); … … 683 683 if (!is_object($this->role_manager)) 684 684 { 685 $this->role_manager = CreateObject('workflow.workflow_rolemanager');685 $this->role_manager = Factory::getInstance('workflow_rolemanager'); 686 686 } 687 687 if (!is_object($this->account)) … … 731 731 if (!is_object($this->role_manager)) 732 732 { 733 $this->role_manager = CreateObject('workflow.workflow_rolemanager');733 $this->role_manager = Factory::getInstance('workflow_rolemanager'); 734 734 } 735 735 if (!is_object($this->account)) -
sandbox/workflow/branches/609/inc/class.run_activity.inc.php
r2249 r2253 10 10 \**************************************************************************/ 11 11 12 require_once(dirname(__FILE__) . SEP . 'common.inc.php'); /* including common deifinitions */ 12 13 require_once(dirname(__FILE__) . SEP . 'class.WorkflowUtils.inc.php' ); /* superclass source code */ 13 14 require_once(dirname(__FILE__) . SEP . 'class.basecontroller.inc.php' ); /* module controller */ 14 15 require_once(dirname(__FILE__) . SEP . 'class.basemodel.inc.php' ); /* module logic */ 15 //require_once(dirname(__FILE__) . SEP . 'class.process_factory.inc.php'); /* module process factory class */16 16 require_once(dirname(__FILE__) . SEP . 'class.utils.security.php' ); /* sanitizes input data */ 17 17 … … 206 206 { 207 207 parent::WorkflowUtils(); 208 $this->runtime = CreateObject('workflow.workflow_wfruntime');208 $this->runtime = Factory::getInstance('workflow_wfruntime'); 209 209 $this->runtime->setDebug(_DEBUG); 210 //$this->base_activity = CreateObject('workflow.workflow_baseactivity');211 //$this->process = CreateObject('workflow.workflow_process');212 $this->GUI = CreateObject('workflow.workflow_gui');210 //$this->base_activity = Factory::getInstance('workflow_baseactivity'); 211 //$this->process = Factory::getInstance('workflow_process'); 212 $this->GUI = Factory::getInstance('workflow_gui'); 213 213 $this->categories = CreateObject('phpgwapi.categories'); 214 214 215 $this->workflowSmarty = CreateObject('workflow.workflow_smarty', false);215 $this->workflowSmarty = Factory::getInstance('workflow_smarty', false); 216 216 // TODO: open a new connection to the database under a different username to allow privilege handling on tables 217 217 /* CELEPAR */ … … 386 386 return false; 387 387 } 388 $smarty = CreateObject('workflow.process_smarty');388 $smarty = Factory::getInstance('process_smarty'); 389 389 } 390 390 … … 399 399 /* #celepar# smarty code*/ 400 400 401 $smarty = CreateObject('workflow.process_smarty');401 $smarty = Factory::getInstance('process_smarty'); 402 402 403 403 $smarty->template_dir = GALAXIA_PROCESSES.SEP.$this->process->getNormalizedName().SEP.'code'.SEP.'templates'; -
sandbox/workflow/branches/609/inc/class.ui_adminaccess.inc.php
r2233 r2253 63 63 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['workflow']['title'] . ' - ' . lang('Access Control List'); 64 64 $GLOBALS['phpgw_info']['flags'] = array('noheader' => false, 'nonavbar' => false, 'currentapp' => 'workflow'); 65 $smarty = CreateObject('workflow.workflow_smarty');65 $smarty = Factory::getInstance('workflow_smarty'); 66 66 67 67 $javaScripts = $this->get_common_js(); -
sandbox/workflow/branches/609/inc/class.ui_adminactivities.inc.php
r2233 r2253 73 73 parent::WorkflowUtils(); 74 74 75 $this->workflow_acl = CreateObject('workflow.workflow_acl');75 $this->workflow_acl = Factory::getInstance('workflow_acl'); 76 76 $denyAccess = true; 77 77 if ($this->workflow_acl->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id'])) … … 106 106 } 107 107 108 $this->process_manager = CreateObject('workflow.workflow_processmanager');109 $this->activity_manager = CreateObject('workflow.workflow_activitymanager');110 $this->role_manager = CreateObject('workflow.workflow_rolemanager');108 $this->process_manager = Factory::getInstance('workflow_processmanager'); 109 $this->activity_manager = Factory::getInstance('workflow_activitymanager'); 110 $this->role_manager = Factory::getInstance('workflow_rolemanager'); 111 111 $this->fs = new FsUtils(); /* gets instance */ 112 112 -
sandbox/workflow/branches/609/inc/class.ui_adminprocesses.inc.php
r2233 r2253 54 54 parent::bo_workflow_forms('admin_processes'); 55 55 56 $this->workflow_acl = CreateObject('workflow.workflow_acl');56 $this->workflow_acl = Factory::getInstance('workflow_acl'); 57 57 $denyAccess = true; 58 58 if ($this->workflow_acl->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id'])) … … 83 83 } 84 84 85 $this->process_manager = CreateObject('workflow.workflow_processmanager');86 $this->activity_manager = CreateObject('workflow.workflow_activitymanager');85 $this->process_manager = Factory::getInstance('workflow_processmanager'); 86 $this->activity_manager = Factory::getInstance('workflow_activitymanager'); 87 87 88 88 $this->form_action = $GLOBALS['phpgw']->link('/index.php', 'menuaction=workflow.ui_adminprocesses.form'); … … 190 190 $known_config_items = array_merge($known_config_items, array('Log Options' => 'title', 'log_level' => $log_levels)); 191 191 192 $bo_agent = CreateObject('workflow.bo_agent_mail_smtp');192 $bo_agent = Factory::getInstance('bo_agent_mail_smtp'); 193 193 $known_config_items = array_merge($known_config_items, $bo_agent->listProcessConfigurationFields()); 194 194 -
sandbox/workflow/branches/609/inc/class.ui_adminroles.inc.php
r2233 r2253 42 42 parent::WorkflowUtils(); 43 43 44 $this->workflow_acl = CreateObject('workflow.workflow_acl');44 $this->workflow_acl = Factory::getInstance('workflow_acl'); 45 45 $denyAccess = true; 46 46 if ($this->workflow_acl->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id'])) … … 71 71 } 72 72 73 $this->process_manager = CreateObject('workflow.workflow_processmanager');74 $this->activity_manager = CreateObject('workflow.workflow_activitymanager');75 $this->role_manager = CreateObject('workflow.workflow_rolemanager');73 $this->process_manager = Factory::getInstance('workflow_processmanager'); 74 $this->activity_manager = Factory::getInstance('workflow_activitymanager'); 75 $this->role_manager = Factory::getInstance('workflow_rolemanager'); 76 76 $this->form_action = $GLOBALS['phpgw']->link('/index.php', 'menuaction=workflow.ui_adminroles.form'); 77 77 -
sandbox/workflow/branches/609/inc/class.ui_agent_mail_smtp.inc.php
r795 r2253 29 29 parent::ui_agent(); 30 30 $this->agent_type = 'mail_smtp'; 31 $this->bo_agent = CreateObject('workflow.bo_agent_mail_smtp');31 $this->bo_agent = Factory::getInstance('bo_agent_mail_smtp'); 32 32 } 33 33 -
sandbox/workflow/branches/609/inc/class.ui_external_applications.inc.php
r2233 r2253 61 61 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['workflow']['title']; 62 62 $GLOBALS['phpgw_info']['flags'] = array('noheader' => false, 'nonavbar' => false, 'currentapp' => 'workflow'); 63 $smarty = CreateObject('workflow.workflow_smarty');63 $smarty = Factory::getInstance('workflow_smarty'); 64 64 65 65 $this->set_wf_session(); -
sandbox/workflow/branches/609/inc/class.ui_monitors.inc.php
r795 r2253 58 58 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['workflow']['title'] . ' - ' . lang('%1 monitoring'); 59 59 $GLOBALS['phpgw_info']['flags'] = array('noheader' => false, 'nonavbar' => false, 'currentapp' => 'workflow'); 60 $smarty = CreateObject('workflow.workflow_smarty');60 $smarty = Factory::getInstance('workflow_smarty'); 61 61 62 62 $javaScripts = $this->get_common_js(); -
sandbox/workflow/branches/609/inc/class.ui_move_instances.inc.php
r795 r2253 36 36 { 37 37 $GLOBALS['phpgw_info']['flags'] = array('noheader' => false, 'nonavbar' => false, 'currentapp' => 'workflow'); 38 $smarty = CreateObject('workflow.workflow_smarty');38 $smarty = Factory::getInstance('workflow_smarty'); 39 39 40 40 $javaScripts = $this->get_common_js(); -
sandbox/workflow/branches/609/inc/class.ui_orgchart.inc.php
r2233 r2253 47 47 function draw($tab_index = "") 48 48 { 49 $this->workflow_acl = CreateObject('workflow.workflow_acl');49 $this->workflow_acl = Factory::getInstance('workflow_acl'); 50 50 51 51 $isAdmin = $this->workflow_acl->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']); … … 63 63 64 64 $GLOBALS['phpgw_info']['flags'] = array('noheader' => false, 'nonavbar' => false, 'currentapp' => 'workflow'); 65 $smarty = CreateObject('workflow.workflow_smarty');65 $smarty = Factory::getInstance('workflow_smarty'); 66 66 67 67 $this->set_wf_session(); -
sandbox/workflow/branches/609/inc/class.ui_phpeditor.inc.php
r2233 r2253 45 45 function ui_phpeditor() 46 46 { 47 $this->bo = CreateObject('workflow.bo_editor');47 $this->bo = Factory::getInstance('bo_editor'); 48 48 $this->loadVariables(); 49 49 } -
sandbox/workflow/branches/609/inc/class.ui_userinterface.inc.php
r2233 r2253 45 45 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['workflow']['title']; 46 46 $GLOBALS['phpgw_info']['flags'] = array('noheader' => false, 'nonavbar' => false, 'currentapp' => 'workflow'); 47 //$smarty = CreateObject('workflow.workflow_smarty');48 47 $smarty = Factory::getInstance('workflow_smarty'); 49 48 … … 132 131 require_once 'class.so_userinterface.inc.php'; 133 132 $so = new so_userinterface(); 134 $smarty = CreateObject('workflow.workflow_smarty');133 $smarty = Factory::getInstance('workflow_smarty'); 135 134 136 135 /* get the user's organization */ -
sandbox/workflow/branches/609/inc/class.workflow_processmanager.inc.php
r2233 r2253 35 35 { 36 36 parent::ProcessManager(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID); 37 $this->workflow_acl = CreateObject('workflow.workflow_acl');37 $this->workflow_acl = Factory::getInstace('workflow_acl'); 38 38 39 39 /* allow regular users to see the process graph */ -
sandbox/workflow/branches/609/inc/engine/config.egw.inc.php
r2233 r2253 305 305 { 306 306 // This way we create a new run_activity instance for the next activity 307 $run_activity = CreateObject('workflow.run_activity.go');307 $run_activity = Factory::getInstance('workflow.run_activity.go'); 308 308 $data = $run_activity->go($activityId, $iid, $auto); 309 309 return $data; -
sandbox/workflow/branches/609/inc/engine/src/common/WfRuntime.php
r795 r2253 1091 1091 $workflow = $GLOBALS['workflow']; 1092 1092 unset($_REQUEST['iid']); 1093 $run_activity = CreateObject('workflow.run_activity');1093 $run_activity = Factory::getInstance('run_activity'); 1094 1094 $run_activity->runtime->instance->parentInstanceId = $this->instance_id; 1095 1095 $run_activity->runtime->instance->parentActivityId = $this->activity_id; -
sandbox/workflow/branches/609/inc/hook_home.inc.php
r795 r2253 22 22 23 23 $title = lang("External Applications"); 24 $bo = CreateObject('workflow.bo_userinterface');24 $bo = Factory::getInstance('bo_userinterface'); 25 25 $externals = $bo -> externals(); 26 26 $extra_data = ''; -
sandbox/workflow/branches/609/inc/hook_sidebox_menu.inc.php
r795 r2253 17 17 18 18 { 19 $workflowACL = CreateObject('workflow.workflow_acl');19 $workflowACL = Factory::getInstance('workflow_acl'); 20 20 $userID = $GLOBALS['phpgw_info']['user']['account_id']; 21 21 $apptitle = $GLOBALS['phpgw_info']['apps'][$appname]['title']; -
sandbox/workflow/branches/609/inc/local/classes/class.JobBase.php
r2249 r2253 200 200 final public function createNewInstance($startActivityId, $instanceName=false, $properties=false, $user=false) 201 201 { 202 $activityManager = CreateObject('workflow.workflow_activitymanager');202 $activityManager = Factory::getInstance('workflow_activitymanager'); 203 203 $activity = $activityManager->get_activity($startActivityId); 204 204 -
sandbox/workflow/branches/609/inc/local/classes/class.wf_engine.php
r795 r2253 68 68 $flagObject[0] = is_null($this->processManager); 69 69 if ($flagObject[0]) 70 $this->processManager = CreateObject('workflow.workflow_processmanager');70 $this->processManager = Factory::getInstance('workflow_processmanager'); 71 71 72 72 $output = array(); … … 247 247 $flagObject[0] = is_null($this->acl); 248 248 if ($flagObject[0]) 249 $this->acl = CreateObject('workflow.workflow_acl');249 $this->acl = Factory::getInstance('workflow_acl'); 250 250 251 251 $output = $this->acl->getUserPermissions($type, $uid); … … 268 268 $flagObject[0] = is_null($this->acl); 269 269 if ($flagObject[0]) 270 $this->acl = CreateObject('workflow.workflow_acl');270 $this->acl = Factory::getInstance('workflow_acl'); 271 271 272 272 $output = $this->acl->getUserGroupPermissions($type, $uid); -
sandbox/workflow/branches/609/inc/local/classes/class.wf_instance.php
r1385 r2253 77 77 { 78 78 $instanceID = (int) $instanceID; 79 $instance = CreateObject('workflow.workflow_instance');79 $instance = Factory::getInstance('workflow_instance'); 80 80 if (!$instance->getInstance($instanceID)) 81 81 return false; … … 118 118 $instance = $this->getInstanceObject($instanceID); 119 119 120 $runActivity = CreateObject('workflow.run_activity');120 $runActivity = Factory::getInstance('run_activity'); 121 121 122 122 ob_start(); -
sandbox/workflow/branches/609/inc/local/classes/class.wf_role.php
r2249 r2253 58 58 59 59 $this->db = &$GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID; 60 $this->roleManager = CreateObject('workflow.workflow_rolemanager');61 $this->activityManager = CreateObject('workflow.workflow_activitymanager');60 $this->roleManager = Factory::getInstance('workflow_rolemanager'); 61 $this->activityManager = Factory::getInstance('workflow_activitymanager'); 62 62 } 63 63 -
sandbox/workflow/branches/609/lib/factory/WorkflowFactory.php
r2249 r2253 57 57 $this->registerFileInfo('BrowserInfo', 'class.BrowserInfo.inc.php', 'inc'); 58 58 59 $this->registerFileInfo('process_smarty', 'class.process_smarty.inc.php', 'inc'); 59 60 $this->registerFileInfo('workflow_smarty', 'class.workflow_smarty.inc.php', 'inc'); 60 61 $this->registerFileInfo('workflow_acl', 'class.workflow_acl.inc.php', 'inc'); 61 62 $this->registerFileInfo('workflow_processmanager', 'class.workflow_processmanager.inc.php', 'inc'); 63 $this->registerFileInfo('workflow_wfruntime', 'class.workflow_wfruntime.inc.php', 'inc'); 64 $this->registerFileInfo('workflow_gui', 'class.workflow_gui.inc.php', 'inc'); 65 $this->registerFileInfo('workflow_rolemanager', 'class.workflow_rolemanager.inc.php', 'inc'); 66 $this->registerFileInfo('workflow_activitymanager', 'class.workflow_activitymanager.inc.php', 'inc'); 67 $this->registerFileInfo('workflow_instance', 'class.workflow_instance.inc.php', 'inc'); 62 68 63 69 $this->registerFileInfo('bo_participants', 'class.bo_participants.inc.php', 'inc');
Note: See TracChangeset
for help on using the changeset viewer.