Changeset 2591 for trunk/workflow/inc/engine/src/ProcessManager
- Timestamp:
- 04/19/10 18:18:22 (14 years ago)
- Location:
- trunk/workflow/inc/engine/src/ProcessManager
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/workflow/inc/engine/src/ProcessManager/ActivityManager.php
r795 r2591 26 26 * @access public 27 27 */ 28 function ActivityManager( &$db)29 { 30 parent::BaseManager( $db);28 function ActivityManager() 29 { 30 parent::BaseManager(); 31 31 $this->child_name = 'ActivityManager'; 32 32 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'ProcessManager' .SEP . 'ProcessManager.php'); … … 370 370 function build_process_graph($pId) 371 371 { 372 if (!(isset($this->process_manager))) $this->process_manager = new ProcessManager($this->db);372 if (!(isset($this->process_manager))) $this->process_manager = &Factory::newInstance('ProcessManager'); 373 373 $attributes = Array( 374 374 375 375 ); 376 $graph = new Process_GraphViz(true,$attributes);376 $graph = &Factory::newInstance('Process_GraphViz', true, $attributes); 377 377 $name = $this->process_manager->_get_normalized_name($pId); 378 378 $graph->set_pid($name); … … 747 747 { 748 748 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP . 'BaseActivity.php'); 749 $act = new BaseActivity($this->db);749 $act = &Factory::newInstance('BaseActivity'); 750 750 //Warning, we now use the BaseActivity object for it, interactivity and autorouting is now true/fales, not y/n 751 751 return ($act->getActivity($activityId,false,true, true)); … … 825 825 function remove_activity($pId, $activityId, $transaction = true) 826 826 { 827 if (!(isset($this->process_manager))) $this->process_manager = new ProcessManager($this->db);827 if (!(isset($this->process_manager))) $this->process_manager = &Factory::newInstance('ProcessManager'); 828 828 $proc_info = $this->process_manager->get_process($pId); 829 829 $actname = $this->_get_normalized_name($activityId); … … 888 888 function replace_activity($pId, $activityId, $vars, $create_files=true) 889 889 { 890 if (!(isset($this->process_manager))) $this->process_manager = new ProcessManager($this->db);890 if (!(isset($this->process_manager))) $this->process_manager = &Factory::newInstance('ProcessManager'); 891 891 $TABLE_NAME = GALAXIA_TABLE_PREFIX.'activities'; 892 892 $now = date("U"); … … 1195 1195 elseif ( (!($result=='*')) && $performAccessCheck) 1196 1196 { 1197 $wf_security = new WfSecurity($this->db);1197 $wf_security = &Factory::getInstance('WfSecurity'); 1198 1198 // perform the check 1199 1199 if (!($wf_security->checkUserAccess($result,$activityId))) -
trunk/workflow/inc/engine/src/ProcessManager/BaseManager.php
r2195 r2591 18 18 * @access public 19 19 */ 20 function BaseManager( &$db)20 function BaseManager() 21 21 { 22 22 $this->child_name = 'BaseManager'; 23 parent::Base( $db);23 parent::Base(); 24 24 } 25 25 -
trunk/workflow/inc/engine/src/ProcessManager/InstanceManager.php
r795 r2591 16 16 * @access public 17 17 */ 18 function InstanceManager( &$db)19 { 20 parent::BaseManager( $db);18 function InstanceManager() 19 { 20 parent::BaseManager(); 21 21 $this->child_name = 'InstanceManager'; 22 22 } -
trunk/workflow/inc/engine/src/ProcessManager/JobManager.php
r795 r2591 76 76 * @access public 77 77 */ 78 public function JobManager( &$db)79 { 80 parent::BaseManager( $db);78 public function JobManager() 79 { 80 parent::BaseManager(); 81 81 $this->child_name = 'JobManager'; 82 82 83 83 $this->jobTable = GALAXIA_TABLE_PREFIX . 'jobs'; 84 84 $this->logTable = GALAXIA_TABLE_PREFIX . 'job_logs'; 85 $this->processManager = new ProcessManager($this->db);85 $this->processManager = &Factory::newInstance('ProcessManager'); 86 86 } 87 87 -
trunk/workflow/inc/engine/src/ProcessManager/ProcessManager.php
r2195 r2591 66 66 * @access public 67 67 */ 68 function ProcessManager( &$db)69 { 70 parent::BaseManager( $db);68 function ProcessManager() 69 { 70 parent::BaseManager(); 71 71 $this->child_name = 'ProcessManager'; 72 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'ProcessManager'.SEP.'ActivityManager.php');73 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'ProcessManager'.SEP.'JobManager.php');74 72 // $this->activity_manager is not set here to avoid objects loading object A loading object B loading object A, etc 75 73 //$this->role_manager will only be loaded when needed as well … … 131 129 function serialize_process($pId) 132 130 { 133 if (!(isset($this->activity_manager))) $this->activity_manager = new ActivityManager($this->db);131 if (!(isset($this->activity_manager))) $this->activity_manager = &Factory::newInstance('ActivityManager'); 134 132 // <process> 135 133 $out = '<process>'."\n"; … … 459 457 { 460 458 //Now the show begins 461 if (!(isset($this->activity_manager))) $this->activity_manager = new ActivityManager($this->db);462 if (!(isset($this->role_manager))) $this->role_manager = new RoleManager($this->db);459 if (!(isset($this->activity_manager))) $this->activity_manager = &Factory::newInstance('ActivityManager'); 460 if (!(isset($this->role_manager))) $this->role_manager = &Factory::newInstance('RoleManager'); 463 461 if (!isset($this->jobManager)) 464 $this->jobManager = new JobManager($this->db);462 $this->jobManager = &Factory::newInstance('JobManager'); 465 463 466 464 // First create the process. Always inactive and inactive first. … … 620 618 function new_process_version($pId, $minor=true) 621 619 { 622 if (!(isset($this->activity_manager))) $this->activity_manager = new ActivityManager($this->db);620 if (!(isset($this->activity_manager))) $this->activity_manager = &Factory::newInstance('ActivityManager'); 623 621 $oldpid = $pId; 624 622 //retrieve process info with config rows … … 671 669 } 672 670 // create roles 673 if (!(isset($this->role_manager))) $this->role_manager = new RoleManager($this->db);671 if (!(isset($this->role_manager))) $this->role_manager = &Factory::newInstance('RoleManager'); 674 672 $query = 'select * from '.GALAXIA_TABLE_PREFIX.'roles where wf_p_id=?'; 675 673 $result = $this->query($query, array($oldpid)); … … 853 851 function remove_process($pId) 854 852 { 855 if (!(isset($this->activity_manager))) $this->activity_manager = new ActivityManager($this->db);853 if (!(isset($this->activity_manager))) $this->activity_manager = &Factory::newInstance('ActivityManager'); 856 854 if (!isset($this->jobManager)) 857 $this->jobManager = new JobManager($this->db);855 $this->jobManager = &Factory::newInstance('JobManager'); 858 856 $this->deactivate_process($pId); 859 857 $name = $this->_get_normalized_name($pId); … … 919 917 function replace_process($pId, &$vars, $create = true) 920 918 { 921 if (!(isset($this->activity_manager))) $this->activity_manager = new ActivityManager($this->db);919 if (!(isset($this->activity_manager))) $this->activity_manager = &Factory::newInstance('ActivityManager'); 922 920 $TABLE_NAME = GALAXIA_TABLE_PREFIX.'processes'; 923 921 $now = date("U"); … … 1296 1294 { 1297 1295 //Warning: this means you have to include the Process.php from the API 1298 $this->Process = new Process($this->db);1296 $this->Process = &Factory::newInstance('Process'); 1299 1297 $this->Process->getProcess($pId); 1300 1298 $result_array = $this->Process->getConfigValues($config_array); … … 1316 1314 { 1317 1315 //Warning: this means you have to include the Process.php from the API 1318 $this->Process = new Process($this->db);1316 $this->Process = &Factory::newInstance('Process'); 1319 1317 $this->Process->getProcess($pId); 1320 1318 $this->Process->setConfigValues($config_array); -
trunk/workflow/inc/engine/src/ProcessManager/RoleManager.php
r795 r2591 19 19 * @access public 20 20 */ 21 function RoleManager( &$db)22 { 23 parent::Base( $db);21 function RoleManager() 22 { 23 parent::Base(); 24 24 $this->child_name = 'RoleManager'; 25 25 } … … 247 247 $result = $this->query($query,$bindvars); 248 248 $ret = Array(); 249 $ldap = & $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');249 $ldap = &Factory::getInstance('WorkflowLDAP'); 250 250 if (!(empty($result))) 251 251 { … … 256 256 //we have a group instead of a simple user and we want real users 257 257 $real_users = galaxia_retrieve_group_users($res['wf_user'], true); 258 foreach ($real_users as $key => $value) 259 { 260 $ret[$key]=$value; 261 } 258 if (!empty($real_users)) { 259 foreach ($real_users as $key => $value) 260 { 261 $ret[$key]=$value; 262 } 263 } 262 264 } 263 265 else
Note: See TracChangeset
for help on using the changeset viewer.