Changeset 2591 for trunk/workflow
- Timestamp:
- 04/19/10 18:18:22 (14 years ago)
- Location:
- trunk/workflow
- Files:
-
- 2 deleted
- 120 edited
- 9 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/workflow/controller.php
r1484 r2591 16 16 { 17 17 require_once dirname(__FILE__) . '/inc/common.inc.php'; 18 $GLOBALS['workflow']['factory']->getInstance('WorkflowMacro')->prepareEnvironment();18 Factory::getInstance('WorkflowMacro')->prepareEnvironment(); 19 19 } 20 20 -
trunk/workflow/doc/change_log.txt
r2589 r2591 30 30 #869 - Indentificação do titular e substituro de áreas do organograma. (pedroerp) 31 31 #868 - Correção da altura das janelas de edição do organograma. (pedroerp) 32 #609 - Reconstrução da classe factory (pedroerp/rufino) 32 33 #441 - Inclusão do período de substituição de chefia no organograma. (pedroerp) 33 34 … … 54 55 [2.0.003] 55 56 56 #899 - Atualização do arquivo default_records com relação ao organograma. (pedroerp)57 #899 - Inclusão de inserts faltantes no arquivo default_records, além de atualização de estrutura de tabelas do organograma. (pedroerp) 57 58 58 59 [2.0.001] -
trunk/workflow/inc/class.CachedLDAP.inc.php
r1310 r2591 97 97 98 98 /* load the information and establish a connection */ 99 $tmpLDAP = &$GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');99 $tmpLDAP =& Factory::getInstance('WorkflowLDAP'); 100 100 $this->userContext = $tmpLDAP->getUserContext(); 101 101 $this->groupContext = $tmpLDAP->getGroupContext(); 102 $this->dataSource = &$GLOBALS['workflow']['workflowObjects']->getLDAP();102 $this->dataSource =& Factory::getInstance('WorkflowObjects')->getLDAP(); 103 103 } 104 104 … … 115 115 116 116 /* establish a connection */ 117 $this->DBLink = &$GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID;117 $this->DBLink =& Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID; 118 118 } 119 119 -
trunk/workflow/inc/class.JobRunner.inc.php
r795 r2591 43 43 $this->parameters = unserialize(base64_decode($parameters)); 44 44 $this->parameters['currentDate'] = new DateTime($this->parameters['currentDate']); 45 $this->jobManager = &$GLOBALS['workflow']['factory']->getInstance('WorkflowJobManager');45 $this->jobManager =& Factory::getInstance('WorkflowJobManager'); 46 46 } 47 47 … … 66 66 { 67 67 /* activate the security policy */ 68 $GLOBALS['workflow']['factory']->getInstance('WorkflowSecurity')->enableSecurityPolicy(); 68 Factory::getInstance('WorkflowSecurity')->enableSecurityPolicy(); 69 70 /** 71 * Since all jobs must run in process mode, e. g. it's user code, 72 * we must enable the security. 73 */ 74 Security::enable(); 69 75 70 76 if (!file_exists($this->parameters['file'])) … … 94 100 95 101 require_once 'common.inc.php'; 96 $GLOBALS['workflow']['factory']->getInstance('WorkflowMacro')->prepareEnvironment();102 Factory::getInstance('WorkflowMacro')->prepareEnvironment(); 97 103 98 $jobRunner = new JobRunner($argv[1]);104 $jobRunner = &Factory::newInstance('JobRunner', $argv[1]); 99 105 $jobRunner->run(); 100 106 ?> -
trunk/workflow/inc/class.JobScheduler.inc.php
r795 r2591 11 11 12 12 require_once 'jobs/class.JobEnum.inc.php'; 13 require_once 'jobs/class.AbsoluteDate.inc.php';14 require_once 'jobs/class.WeekDate.inc.php';15 require_once 'jobs/class.RelativeDate.inc.php';16 13 17 14 /** … … 57 54 { 58 55 $this->currentDate = new DateTime(date('Y-n-j G:i:00')); 59 $this->db = & $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID;60 $this->jobManager = & $GLOBALS['workflow']['factory']->getInstance('WorkflowJobManager');56 $this->db = &Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID; 57 $this->jobManager = &Factory::getInstance('WorkflowJobManager'); 61 58 } 62 59 … … 76 73 { 77 74 case DateType::ABSOLUTE_DATE: 78 $object = new AbsoluteDate($startDate, $interval);75 $object = &Factory::getInstance('AbsoluteDate', $startDate, $interval); 79 76 break; 80 77 81 78 case DateType::WEEK_DATE: 82 $object = new WeekDate($startDate, $interval);79 $object = &Factory::getInstance('WeekDate', $startDate, $interval); 83 80 $object->setWeekDays($record['week_days']); 84 81 break; 85 82 86 83 case DateType::RELATIVE_DATE: 87 $object = new RelativeDate($startDate, $interval);84 $object = &Factory::getInstance('RelativeDate', $startDate, $interval); 88 85 $object->setOffset($record['month_offset']); 89 86 break; … … 171 168 $previousDir = getcwd(); 172 169 chdir(GALAXIA_LIBRARY . '/../'); 173 $output = $GLOBALS['workflow']['factory']->newInstance('Thread', 'class.JobRunner.inc.php "' . $parameters . '"');170 $output = Factory::newInstance('Thread', 'class.JobRunner.inc.php "' . $parameters . '"'); 174 171 chdir($previousDir); 175 172 return $output; … … 192 189 { 193 190 require_once 'common.inc.php'; 194 $GLOBALS['workflow']['factory']->getInstance('WorkflowMacro')->prepareEnvironment();191 Factory::getInstance('WorkflowMacro')->prepareEnvironment(); 195 192 196 $job = new JobScheduler();193 $job = Factory::newInstance('JobScheduler'); 197 194 $job->run(); 198 195 } -
trunk/workflow/inc/class.Logger.inc.php
r900 r2591 80 80 { 81 81 82 $this->db =& $GLOBALS['workflow']['workflowObjects']->getDBExpresso()->Link_ID;82 $this->db =& Factory::getInstance('WorkflowObjects')->getDBExpresso()->Link_ID; 83 83 84 84 if(!empty($curProcessName)){ -
trunk/workflow/inc/class.ResourcesRedirector.inc.php
r795 r2591 54 54 if (!isset($_SESSION['workflow']['ResourcesRedirector'][$this->pid])) 55 55 { 56 $result = $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID->query('SELECT wf_normalized_name FROM egw_wf_processes WHERE wf_p_id = ?', array($this->pid));56 $result = Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID->query('SELECT wf_normalized_name FROM egw_wf_processes WHERE wf_p_id = ?', array($this->pid)); 57 57 if ($result->numRows() != 1) 58 58 return; … … 94 94 { 95 95 /* em último caso, tenta buscar a informação em banco de dados */ 96 $result = $GLOBALS['workflow']['workflowObjects']->getDBExpresso()->Link_ID->query('SELECT config_value FROM phpgw_config WHERE config_app = ? AND config_name = ?', array('phpgwapi', 'files_dir'));96 $result = Factory::getInstance('WorkflowObjects')->getDBExpresso()->Link_ID->query('SELECT config_value FROM phpgw_config WHERE config_app = ? AND config_name = ?', array('phpgwapi', 'files_dir')); 97 97 if (empty($result)) 98 98 return; -
trunk/workflow/inc/class.TemplateServer.inc.php
r795 r2591 99 99 else 100 100 { 101 $GLOBALS['workflow']['factory']->getInstance('WorkflowMacro')->prepareEnvironment();101 Factory::getInstance('WorkflowMacro')->prepareEnvironment(); 102 102 if (!isset($GLOBALS['phpgw_info']['login_template_set'])) 103 103 return false; … … 131 131 { 132 132 /* se não for encontrado em nenhuma variável de ambiente, tenta carregar do banco de dados */ 133 $webServerURL = (string) $GLOBALS['workflow']['workflowObjects']->getDBExpresso()->Link_ID->GetOne('SELECT config_value FROM phpgw_config WHERE config_app = ? AND config_name = ?', array('phpgwapi', 'webserver_url'));133 $webServerURL = (string) Factory::getInstance('WorkflowObjects')->getDBExpresso()->Link_ID->GetOne('SELECT config_value FROM phpgw_config WHERE config_app = ? AND config_name = ?', array('phpgwapi', 'webserver_url')); 134 134 $this->WEB_WORKFLOW_BASE = str_replace('//', '/', "{$webServerURL}/workflow"); 135 135 } -
trunk/workflow/inc/class.UserPictureProvider.inc.php
r795 r2591 114 114 /* em último caso, tenta buscar a informação em banco de dados */ 115 115 /* prepara o ambiente para a carga de informações sobre o banco de dados */ 116 $result = $GLOBALS['workflow']['workflowObjects']->getDBExpresso()->Link_ID->query('SELECT config_value FROM phpgw_config WHERE config_app = ? AND config_name = ?', array('phpgwapi', 'files_dir'));116 $result = Factory::getInstance('WorkflowObjects')->getDBExpresso()->Link_ID->query('SELECT config_value FROM phpgw_config WHERE config_app = ? AND config_name = ?', array('phpgwapi', 'files_dir')); 117 117 if (empty($result)) 118 118 return; … … 141 141 mkdir($baseDirectory, 0770, true); 142 142 143 $contents = $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getUserPicture($this->userID);143 $contents = Factory::getInstance('WorkflowLDAP')->getUserPicture($this->userID); 144 144 $success = true; 145 145 if ($contents !== false) … … 165 165 } 166 166 167 $GLOBALS['workflow']['factory']->getInstance('ResourcesRedirector')->show($filename);167 Factory::getInstance('ResourcesRedirector')->show($filename); 168 168 } 169 169 } -
trunk/workflow/inc/class.WorkflowJobManager.inc.php
r795 r2591 16 16 public function WorkflowJobManager() 17 17 { 18 parent::JobManager( $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);18 parent::JobManager(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID); 19 19 } 20 20 } -
trunk/workflow/inc/class.WorkflowLDAP.inc.php
r795 r2591 50 50 function WorkflowLDAP() 51 51 { 52 $this->dataSource = &$GLOBALS['workflow']['workflowObjects']->getLDAP();52 $this->dataSource =& Factory::getInstance('WorkflowObjects')->getLDAP(); 53 53 54 54 /* get the required parameters */ -
trunk/workflow/inc/class.WorkflowMacro.inc.php
r795 r2591 40 40 require dirname(__FILE__) . '/../setup/setup.inc.php'; /* DO NOT USE require_once */ 41 41 $GLOBALS['phpgw_info']['apps']['workflow'] = $setup_info['workflow']; 42 $row = $GLOBALS['workflow']['workflowObjects']->getDBExpresso()->Link_ID->query('SELECT config_value FROM phpgw_config WHERE config_app = ? AND config_name = ?', array('phpgwapi', 'files_dir'))->fetchRow();42 $row = Factory::getInstance('WorkflowObjects')->getDBExpresso()->Link_ID->query('SELECT config_value FROM phpgw_config WHERE config_app = ? AND config_name = ?', array('phpgwapi', 'files_dir'))->fetchRow(); 43 43 $_SESSION['phpgw_info']['workflow']['vfs_basedir'] = ($row !== false) ? $row['config_value'] : '/home/expressolivre'; 44 44 $_SESSION['phpgw_info']['workflow']['phpgw_api_inc'] = PHPGW_API_INC; … … 48 48 require_once PHPGW_API_INC . '/functions.inc.php'; 49 49 require_once 'engine/class.ajax_config.inc.php'; 50 require_once 'engine/class.ajax_ldap.inc.php';51 50 require_once 'engine/config.ajax.inc.php'; 52 $GLOBALS['ajax']->ldap = new ajax_ldap();51 $GLOBALS['ajax']->ldap = &Factory::getInstance('ajax_ldap'); 53 52 54 53 /* definição de algumas constantes */ … … 64 63 public function prepareProcessEnvironment($processID) 65 64 { 66 require_once GALAXIA_LIBRARY . '/src/common/WfRuntime.php';67 65 require_once PHPGW_SERVER_ROOT . '/workflow/inc/local/functions/local.functions.php'; 68 66 69 $runtime = new WfRuntime($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);67 $runtime = &Factory::getInstance('WfRuntime'); 70 68 $runtime->loadProcess($processID); 71 69 -
trunk/workflow/inc/class.WorkflowObjects.inc.php
r795 r2591 87 87 { 88 88 /* connect to the database */ 89 $this->cache['DBGalaxia'] = $GLOBALS['workflow']['factory']->newInstance('WorkflowWatcher', $GLOBALS['workflow']['factory']->newForeignInstance('phpgwapi','db'));89 $this->cache['DBGalaxia'] = Factory::newInstance('WorkflowWatcher', Factory::newInstance('db')); 90 90 $this->cache['DBGalaxia']->disconnect(); /* for some reason it won't connect to the desired database unless we disconnect it first */ 91 91 $this->cache['DBGalaxia']->Halt_On_Error = 'no'; … … 98 98 $dbConfigValues['workflow_database_type'] 99 99 ); 100 $GLOBALS['workflow']['factory']->getInstance('WorkflowSecurity')->removeSensitiveInformationFromDatabaseObject($this->cache['DBGalaxia']);101 $this->cache['DBGalaxia']->Link_ID = $GLOBALS['workflow']['factory']->newInstance('WorkflowWatcher', $this->cache['DBGalaxia']->Link_ID);100 Factory::getInstance('WorkflowSecurity')->removeSensitiveInformationFromDatabaseObject($this->cache['DBGalaxia']); 101 $this->cache['DBGalaxia']->Link_ID = Factory::newInstance('WorkflowWatcher', $this->cache['DBGalaxia']->Link_ID); 102 102 } 103 103 else … … 128 128 if (!isset($connectionInfo['db_name'])) 129 129 { 130 $GLOBALS['workflow']['factory']->getInstance('WorkflowMacro')->prepareEnvironment();130 Factory::getInstance('WorkflowMacro')->prepareEnvironment(); 131 131 if (isset($GLOBALS['phpgw_info']['server'])) 132 132 $connectionInfo = $GLOBALS['phpgw_info']['server']; … … 136 136 137 137 /* connect to the database */ 138 $this->cache['DBExpresso'] = $GLOBALS['workflow']['factory']->newInstance('WorkflowWatcher', $GLOBALS['workflow']['factory']->newForeignInstance('phpgwapi','db'));138 $this->cache['DBExpresso'] = Factory::newInstance('WorkflowWatcher', Factory::newInstance('db')); 139 139 $this->cache['DBExpresso']->disconnect(); /* for some reason it won't connect to the desired database unless we disconnect it first */ 140 140 $this->cache['DBExpresso']->Halt_On_Error = 'no'; … … 147 147 $connectionInfo['db_type'] 148 148 ); 149 $GLOBALS['workflow']['factory']->getInstance('WorkflowSecurity')->removeSensitiveInformationFromDatabaseObject($this->cache['DBExpresso']);150 $this->cache['DBExpresso']->Link_ID = $GLOBALS['workflow']['factory']->newInstance('WorkflowWatcher', $this->cache['DBExpresso']->Link_ID);149 Factory::getInstance('WorkflowSecurity')->removeSensitiveInformationFromDatabaseObject($this->cache['DBExpresso']); 150 $this->cache['DBExpresso']->Link_ID = Factory::newInstance('WorkflowWatcher', $this->cache['DBExpresso']->Link_ID); 151 151 } 152 152 … … 177 177 178 178 /* connect to the database */ 179 $this->cache['DBWorkflow'] = $GLOBALS['workflow']['factory']->newInstance('WorkflowWatcher', $GLOBALS['workflow']['factory']->newForeignInstance('phpgwapi','db'));179 $this->cache['DBWorkflow'] = Factory::newInstance('WorkflowWatcher', Factory::newInstance('db')); 180 180 $this->cache['DBWorkflow']->disconnect(); /* for some reason it won't connect to the desired database unless we disconnect it first */ 181 181 $this->cache['DBWorkflow']->Halt_On_Error = 'no'; … … 188 188 $dbConfigValues['database_type'] 189 189 ); 190 $GLOBALS['workflow']['factory']->getInstance('WorkflowSecurity')->removeSensitiveInformationFromDatabaseObject($this->cache['DBWorkflow']);191 $this->cache['DBWorkflow']->Link_ID = $GLOBALS['workflow']['factory']->newInstance('WorkflowWatcher', $this->cache['DBWorkflow']->Link_ID);190 Factory::getInstance('WorkflowSecurity')->removeSensitiveInformationFromDatabaseObject($this->cache['DBWorkflow']); 191 $this->cache['DBWorkflow']->Link_ID = Factory::newInstance('WorkflowWatcher', $this->cache['DBWorkflow']->Link_ID); 192 192 } 193 193 -
trunk/workflow/inc/class.WorkflowSecurity.inc.php
r795 r2591 51 51 { 52 52 /* garante que o objeto de DataBase do Expresso estará disponível */ 53 $GLOBALS['workflow']['workflowObjects']->getDBExpresso();53 Factory::getInstance('WorkflowObjects')->getDBExpresso(); 54 54 } 55 55 … … 77 77 continue; 78 78 $this->removeSensitiveInformationFromDatabaseObject($variable); 79 $variable = $GLOBALS['workflow']['factory']->newInstance('WorkflowWatcher', $variable);79 $variable = Factory::newInstance('WorkflowWatcher', $variable); 80 80 } 81 81 } -
trunk/workflow/inc/class.WorkflowUtils.inc.php
r795 r2591 1 1 <?php 2 require_once 'common.inc.php'; 3 2 4 //set here the global DEBUG level which is actually 0 (nothing) or 1 (all) 3 5 if (!defined('_DEBUG')) define('_DEBUG', 0); … … 102 104 $this->start = (int)get_var('start', 'any', 0); 103 105 $this->search_str = get_var('find', 'any', ''); 104 $this->nextmatchs = CreateObject('phpgwapi.nextmatchs');106 $this->nextmatchs = Factory::getInstance('nextmatchs'); 105 107 } 106 108 107 109 /** 108 110 * Fill the process bar 109 * 111 * 110 112 * @param array $proc_info 111 113 * @access public … … 116 118 //echo "proc_info: <pre>";print_r($proc_info);echo "</pre>"; 117 119 $this->t->set_file('proc_bar_tpl', 'proc_bar.tpl'); 118 $templateServer = & $GLOBALS['workflow']['factory']->getInstance('TemplateServer');120 $templateServer = &Factory::getInstance('TemplateServer'); 119 121 120 122 if ($proc_info['wf_is_valid'] == 'y') … … 170 172 /** 171 173 * Select activity representation icon 172 * 174 * 173 175 * @var string $type type of activity 174 176 * @var bool $interactive interactive? … … 207 209 $ic="no-activity.gif"; 208 210 } 209 return '<img src="'. $GLOBALS['workflow']['factory']->getInstance('TemplateServer')->generateImageLink($ic) .'" alt="'. lang($type) .'" title="'. lang($type) .'" />';210 } 211 211 return '<img src="'. Factory::getInstance('TemplateServer')->generateImageLink($ic) .'" alt="'. lang($type) .'" title="'. lang($type) .'" />'; 212 } 213 212 214 /** 213 215 * Translate template file 214 * @param string $template_name template name 216 * @param string $template_name template name 215 217 * @return void 216 218 * @access public … … 359 361 function export() 360 362 { 361 $this->process_manager = CreateObject('workflow.workflow_processmanager');363 $this->process_manager = Factory::getInstance('workflow_processmanager'); 362 364 363 365 // retrieve process info … … 387 389 { 388 390 $file = "css/$css_name" . (($print_mode !== false) ? '_print' : '') . '.css'; 389 return $GLOBALS['workflow']['factory']->getInstance('TemplateServer')->getWebFile($file);390 } 391 391 return Factory::getInstance('TemplateServer')->getWebFile($file); 392 } 393 392 394 /** 393 395 * Return a given duration in human readable form, usefull for workitems duration 394 396 * @param int $to given duration 395 397 * @return string given duration in human readable form 396 * @access public 398 * @access public 397 399 */ 398 400 function time_diff($to) { -
trunk/workflow/inc/class.bo_adminaccess.inc.php
r795 r2591 11 11 12 12 require_once('class.bo_ajaxinterface.inc.php'); 13 require_once('class.so_adminaccess.inc.php');14 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ProcessManager.php');15 13 require_once(PHPGW_API_INC . SEP . 'common_functions.inc.php'); 16 require_once(PHPGW_API_INC . SEP . 'class.acl.inc.php');17 14 18 15 /** … … 43 40 parent::bo_ajaxinterface(); 44 41 45 if (! $GLOBALS['workflow']['factory']->getInstance('workflow_acl')->checkWorkflowAdmin($_SESSION['phpgw_info']['workflow']['account_id']))42 if (!Factory::getInstance('workflow_acl')->checkWorkflowAdmin($_SESSION['phpgw_info']['workflow']['account_id'])) 46 43 exit(serialize(array('error' => 'Você não tem permissão para executar esta operação.'))); 47 44 48 $this->so = new so_adminaccess($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);45 $this->so = &Factory::getInstance('so_adminaccess', Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID); 49 46 } 50 47 … … 57 54 function get_all_processes() 58 55 { 59 $proc_mng = new ProcessManager($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);56 $proc_mng = &Factory::newInstance('ProcessManager'); 60 57 $proc_list = $proc_mng->list_processes(0,-1,'wf_name__ASC'); 61 58 … … 315 312 { 316 313 $GLOBALS['phpgw']->db = $GLOBALS['ajax']->db; 317 $acl = new ACL();314 $acl = &Factory::getInstance('acl'); 318 315 $output = $this->so->getUserNames($acl->get_ids_for_location('admin_workflow', 1, 'workflow')); 319 316 unset($GLOBALS['phpgw']->db); … … 332 329 $ids = explode('.', str_replace('g', '', str_replace('u', '', $params['user_ids']))); 333 330 $GLOBALS['phpgw']->db = $GLOBALS['ajax']->db; 334 $acl = new ACL();331 $acl = &Factory::getInstance('acl'); 335 332 foreach ($ids as $id) 336 333 $acl->add_repository('workflow', 'admin_workflow', $id, 1); … … 350 347 { 351 348 $GLOBALS['phpgw']->db = $GLOBALS['ajax']->db; 352 $acl = new ACL();349 $acl = &Factory::getInstance('acl'); 353 350 $acl->delete_repository('workflow', 'admin_workflow', (int) $params['admin_id']); 354 351 unset($GLOBALS['phpgw']->db); -
trunk/workflow/inc/class.bo_adminjobs.inc.php
r795 r2591 11 11 12 12 require_once 'class.bo_ajaxinterface.inc.php'; 13 require_once 'class.so_adminjobs.inc.php';14 require_once 'nano/JSON.php';15 13 16 14 /** … … 36 34 { 37 35 parent::bo_ajaxinterface(); 38 $this->so = new so_adminjobs();36 $this->so = &Factory::getInstance('so_adminjobs'); 39 37 } 40 38 … … 100 98 /* paginate the result */ 101 99 $logEntriesPerPage = 30; 102 $paging = &$GLOBALS['workflow']['factory']->newInstance('Paging', $logEntriesPerPage, $params);100 $paging =& Factory::newInstance('Paging', $logEntriesPerPage, $params); 103 101 $logs = $paging->restrictItems($logs); 104 102 -
trunk/workflow/inc/class.bo_adminsource.inc.php
r795 r2591 11 11 12 12 require_once('class.bo_ajaxinterface.inc.php'); 13 14 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ProcessManager.php');15 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'RoleManager.php');16 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ActivityManager.php');17 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'API' . SEP . 'Process.php');18 13 19 14 /** … … 80 75 $fileSizeUnit[] = 'Mb'; 81 76 $fileSizeUnit[] = 'Gb'; 82 77 83 78 $unitSelect = 0; 84 79 while ($value > 1024.0) … … 87 82 $unitSelect++; 88 83 } 89 84 90 85 $output = round($value, 1); 91 86 $output .= " " . $fileSizeUnit[$unitSelect]; 92 87 93 88 return $output; 94 89 } 95 90 96 91 /** 97 92 * Get process toolbar data 98 * @param array $p process process data 99 * @return array 100 * @access public 101 */ 102 function get_toolbar_data($p) 103 { 104 105 $process_manager = new ProcessManager($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);106 $proc_info = $process_manager->get_process($p['proc_id']); 107 93 * @param array $p process process data 94 * @return array 95 * @access public 96 */ 97 function get_toolbar_data($p) 98 { 99 100 $process_manager = &Factory::newInstance('ProcessManager'); 101 $proc_info = $process_manager->get_process($p['proc_id']); 102 108 103 $web_server_url = $_SESSION['phpgw_info']['workflow']['server']['webserver_url']; 109 $img_default_dir = $GLOBALS['workflow']['factory']->getInstance('TemplateServer')->generateImageLink('');110 104 $img_default_dir = Factory::getInstance('TemplateServer')->generateImageLink(''); 105 111 106 if ($proc_info['wf_is_valid'] == 'y') 112 107 { … … 119 114 $alt_validity = tra('invalid'); 120 115 } 121 116 122 117 // if process is active show stop button. Else show start button, but only if it is valid. If it's not valid, don't show any activation or stop button. 123 118 if ($proc_info['wf_is_active'] == 'y') … … 138 133 $start_stop_img = ''; 139 134 } 140 135 141 136 /* load other processes link */ 142 137 $proc_ids = $GLOBALS['ajax']->acl->get_granted_processes($_SESSION['phpgw_info']['workflow']['account_id']); … … 145 140 else 146 141 $where = ' wf_p_id = -1 '; 147 142 148 143 $processesInfo = &$process_manager->list_processes(0, -1, 'wf_name__asc', '', $where); 149 144 $otherProcesses = array(); 150 145 foreach ($processesInfo['data'] as $pi) 151 146 $otherProcesses[] = array("name" => $pi['wf_name'] . " (v" . $pi['wf_version'] . ")", "link" => $web_server_url . "/index.php?menuaction=workflow.ui_adminsource.form&p_id=" . $pi['wf_p_id'], "pid" => $pi['wf_p_id']); 152 147 153 148 $toolbar_data = array ( 154 149 'proc_name' => $proc_info['wf_name'], … … 177 172 'other_processes' => $otherProcesses 178 173 ); 179 174 180 175 return $toolbar_data; 181 176 } 182 183 177 178 184 179 /** 185 180 * Get process model files 186 * @param array $p process process data 187 * @return array 188 * @access public 181 * @param array $p process process data 182 * @return array 183 * @access public 189 184 */ 190 185 function get_model_files($p) 191 186 { 192 switch($p['type']) 187 switch($p['type']) 193 188 { 194 189 case 'include' : $path = PHPGW_SERVER_ROOT . SEP . 'workflow' . SEP . 'js' . SEP . 'adminsource' . SEP . 'inc'; … … 203 198 $files = array(); 204 199 205 if ($handle = opendir($path)) 206 { 207 while (false !== ($file_name = readdir($handle))) 208 { 209 if (!is_dir($path.SEP.$file_name)) 200 if ($handle = opendir($path)) 201 { 202 while (false !== ($file_name = readdir($handle))) 203 { 204 if (!is_dir($path.SEP.$file_name)) 210 205 { 211 206 $files[] = array('file_name' => $file_name); … … 217 212 array_multisort($col_file_name,SORT_ASC,$files); 218 213 219 return $files; 214 return $files; 220 215 } 221 216 222 217 /** 223 218 * Get process php files 224 * @param array $p process data 225 * @return array 226 * @access public 219 * @param array $p process data 220 * @return array 221 * @access public 227 222 */ 228 223 function get_php_files($p) 229 224 { 230 $process_manager = new ProcessManager($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);225 $process_manager = &Factory::newInstance('ProcessManager'); 231 226 $proc_info = $process_manager->get_process($p['proc_id']); 232 $activity_manager = new ActivityManager($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);227 $activity_manager = &Factory::newInstance('ActivityManager'); 233 228 $process_activities = $activity_manager->list_activities($p['proc_id'], 0, -1, 'wf_name__asc', '','',false); 234 229 $path = GALAXIA_PROCESSES . SEP . $proc_info['wf_normalized_name'] . SEP . 'code' . SEP .'activities' . SEP; 235 230 236 231 $files = array(); 237 232 … … 242 237 foreach ($process_activities['data'] as $process_activity) 243 238 { 244 239 245 240 $file_name = $process_activity['wf_normalized_name'].'.php'; 246 241 $activity_id = $process_activity['wf_activity_id']; 247 242 $tamanho = filesize($path.$file_name); 248 243 $modificado = date('d/m/Y H:i:s', filemtime($path.$file_name) ); 249 244 250 245 $files[] = array('file_name' => $file_name, 251 246 'activity_id' => $activity_id, … … 258 253 'tipo_codigo' => 'atividade' 259 254 ); 260 255 261 256 $col_file_name[] = $file_name; 262 257 $col_tamanho[] = $tamanho; 263 258 $col_modificado[] = $modificado; 264 259 } 265 266 if (isset($p['sort'])) 260 261 if (isset($p['sort'])) 267 262 { 268 263 $order_by = ($p['order_by'] == 1) ? SORT_ASC : SORT_DESC; … … 279 274 } 280 275 } 281 282 return $files; 283 } 284 285 /** 286 * Delete process file 276 277 return $files; 278 } 279 280 /** 281 * Delete process file 287 282 * @param array $p process data 288 283 * @return array 289 * @access public 284 * @access public 290 285 */ 291 286 function delete_file($p) … … 293 288 if ((strpos($p['file_name'],'/') !== false) || (strpos($p['file_name'],'/') !== false)) 294 289 return 'Não foi possível executar a operação solicitada'; 295 $process_manager = new ProcessManager($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);296 $proc_info = $process_manager->get_process($p['proc_id']); 290 $process_manager = &Factory::newInstance('ProcessManager'); 291 $proc_info = $process_manager->get_process($p['proc_id']); 297 292 $file_name = $p['file_name']; 298 $proc_name = $proc_info['wf_normalized_name']; 293 $proc_name = $proc_info['wf_normalized_name']; 299 294 $type = $p['type']; 300 295 if (strpos($file_name,'/')) return 'Nome de arquivo inválido.'; 301 296 if (!strlen($proc_name)) return 'ID de Processo inválido.'; 302 297 303 298 switch($type) 304 299 { … … 315 310 $path = GALAXIA_PROCESSES . '/' . $proc_info['wf_normalized_name'] . '/resources/' . $file_name; 316 311 break; 317 312 318 313 } 319 320 if ($type == 'resource') 314 315 if ($type == 'resource') 321 316 { 322 317 $complete_path = $path; 323 } 324 else 318 } 319 else 325 320 { 326 321 $complete_path = GALAXIA_PROCESSES . SEP . $proc_name . SEP . 'code' . SEP . $path; 327 322 } 328 329 if (file_exists($complete_path)) 323 324 if (file_exists($complete_path)) 330 325 { 331 326 if (unlink($complete_path)) … … 342 337 return 'O arquivo '.$file_name.' não existe.'; 343 338 } 344 } 345 /** 346 * Create process new file 339 } 340 /** 341 * Create process new file 347 342 * @param array $p process 348 343 * @return array 349 * @access public 344 * @access public 350 345 */ 351 346 function create_file($p) 352 347 { 353 $process_manager = new ProcessManager($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);354 $proc_info = $process_manager->get_process($p['proc_id']); 348 $process_manager = &Factory::newInstance('ProcessManager'); 349 $proc_info = $process_manager->get_process($p['proc_id']); 355 350 $file_name = $p['file_name']; 356 $proc_name = $proc_info['wf_normalized_name']; 351 $proc_name = $proc_info['wf_normalized_name']; 357 352 $type = $p['type']; 358 353 … … 386 381 } 387 382 388 if (file_exists($complete_path)) 389 { 390 if (!$p['rewrite']) 383 if (file_exists($complete_path)) 384 { 385 if (!$p['rewrite']) 391 386 { 392 387 return FILE_ALREADY_EXISTS; … … 396 391 } 397 392 398 if ($fp = fopen($complete_path, 'w')) 393 if ($fp = fopen($complete_path, 'w')) 399 394 { 400 395 $basepath = PHPGW_SERVER_ROOT.SEP.'workflow'.SEP.'js'.SEP.'adminsource'; … … 409 404 if ($type == 'template' || $type == 'include') 410 405 { 411 if (file_exists($basepath.SEP.$p['modelo'])) 406 if (file_exists($basepath.SEP.$p['modelo'])) 412 407 { 413 408 fwrite($fp,file_get_contents($basepath.SEP.$p['modelo'])); … … 423 418 } 424 419 } 425 420 426 421 /** 427 422 * Get process include files 428 423 * @param array $p process 429 424 * @return array 430 * @access public 425 * @access public 431 426 */ 432 427 function get_include_files($p) 433 428 { 434 $process_manager = new ProcessManager($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);435 $proc_info = $process_manager->get_process($p['proc_id']); 429 $process_manager = &Factory::newInstance('ProcessManager'); 430 $proc_info = $process_manager->get_process($p['proc_id']); 436 431 $path = GALAXIA_PROCESSES . SEP . $proc_info['wf_normalized_name'] . SEP . 'code'; 437 432 … … 442 437 $files = array(); 443 438 444 if ($handle = opendir($path)) 445 { 446 while (false !== ($file_name = readdir($handle))) 447 { 448 if (!is_dir($path.SEP.$file_name)) 439 if ($handle = opendir($path)) 440 { 441 while (false !== ($file_name = readdir($handle))) 442 { 443 if (!is_dir($path.SEP.$file_name)) 449 444 { 450 445 $tamanho = filesize($path.SEP.$file_name); … … 467 462 468 463 469 if (isset($p['sort'])) 464 if (isset($p['sort'])) 470 465 { 471 466 $order_by = ($p['order_by'] == 1) ? SORT_ASC : SORT_DESC; … … 483 478 } 484 479 485 return $files; 486 } 487 488 /** 489 * Get process template files 490 * @param array $p process data 491 * @return array 492 * @access public 480 return $files; 481 } 482 483 /** 484 * Get process template files 485 * @param array $p process data 486 * @return array 487 * @access public 493 488 */ 494 489 function get_template_files($p) 495 490 { 496 $process_manager = new ProcessManager($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);497 $proc_info = $process_manager->get_process($p['proc_id']); 491 $process_manager = &Factory::newInstance('ProcessManager'); 492 $proc_info = $process_manager->get_process($p['proc_id']); 498 493 $path = GALAXIA_PROCESSES . SEP . $proc_info['wf_normalized_name'] . SEP . 'code' . SEP .'templates'; 499 494 … … 502 497 $col_modificado = array(); 503 498 504 if ($handle = opendir($path)) 505 { 506 while (false !== ($file_name = readdir($handle))) 507 { 508 if (!is_dir($path.SEP.$file_name)) 499 if ($handle = opendir($path)) 500 { 501 while (false !== ($file_name = readdir($handle))) 502 { 503 if (!is_dir($path.SEP.$file_name)) 509 504 { 510 505 $tamanho = filesize($path.SEP.$file_name); … … 541 536 542 537 } 543 } 544 545 return $files; 546 } 547 548 /** 549 * Upload process resource 550 * 538 } 539 540 return $files; 541 } 542 543 /** 544 * Upload process resource 545 * 551 546 * @param array $p process 552 547 * @return array 553 * @access public 548 * @access public 554 549 */ 555 550 function upload_resource($p) 556 551 { 557 $process_manager = new ProcessManager($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);552 $process_manager = &Factory::newInstance('ProcessManager'); 558 553 $proc_info = $process_manager->get_process($p['proc_id']); 559 554 $file_name = basename($_FILES['resource_file']['name']); … … 587 582 if (strpos($_REQUEST['file_name'],'/') !== false) 588 583 return 'Não foi possível executar a operação solicitada'; 589 $process_manager = new ProcessManager($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);584 $process_manager = &Factory::newInstance('ProcessManager'); 590 585 $proc_info = $process_manager->get_process($_REQUEST['proc_id']); 591 586 … … 617 612 $completePath = GALAXIA_PROCESSES . SEP . $proc_name . SEP . 'code' . SEP . $path; 618 613 619 $GLOBALS['workflow']['factory']->getInstance('ResourcesRedirector')->show($completePath, 'application/force-download');614 Factory::getInstance('ResourcesRedirector')->show($completePath, 'application/force-download'); 620 615 exit; 621 616 } … … 630 625 function get_resource_files($p) 631 626 { 632 $process_manager = new ProcessManager($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);627 $process_manager = &Factory::newInstance('ProcessManager'); 633 628 $proc_info = $process_manager->get_process($p['proc_id']); 634 629 -
trunk/workflow/inc/class.bo_agent.inc.php
r795 r2591 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 } -
trunk/workflow/inc/class.bo_agent_mail_smtp.inc.php
r795 r2591 109 109 { 110 110 parent::bo_agent(); 111 $this->so_agent = CreateObject('workflow.so_agent_mail_smtp');112 $this->bo_emailadmin = CreateObject('emailadmin.bo');111 $this->so_agent = Factory::getInstance('so_agent_mail_smtp'); 112 $this->bo_emailadmin = Factory::getInstance('bo'); 113 113 //the showProcessConfigurationFields is not done here, quite harder to build 114 114 $this->ProcessConfigurationFieldsdefault = array( … … 312 312 function init() 313 313 { 314 $this->mail = CreateObject('phpgwapi.phpmailer');314 $this->mail = Factory::getInstance('phpmailer'); 315 315 //set the $this->conf 316 316 $this->getProcessConfigurationFields($this->activity->getProcessId()); … … 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(); … … 674 674 if (!is_object($this->account)) 675 675 { 676 $this->account = CreateObject('phpgwapi.accounts');676 $this->account = Factory::getInstance('accounts'); 677 677 } 678 678 $ask_user = $this->instance->getOwner(); … … 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)) 688 688 { 689 $this->account = CreateObject('phpgwapi.accounts');689 $this->account = Factory::getInstance('accounts'); 690 690 } 691 691 $my_subset = array('wf_activity_name' => $this->activity->getName()); … … 718 718 if (!is_object($this->account)) 719 719 { 720 $this->account = CreateObject('phpgwapi.accounts');720 $this->account = Factory::getInstance('accounts'); 721 721 } 722 722 $ask_user = $this->account->name2id($second_part); … … 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)) 736 736 { 737 $this->account = CreateObject('phpgwapi.accounts');737 $this->account = Factory::getInstance('accounts'); 738 738 } 739 739 $my_subset = array('wf_role_name' => $second_part); -
trunk/workflow/inc/class.bo_ajaxinterface.inc.php
r795 r2591 36 36 37 37 require_once(PHPGW_SERVER_ROOT . SEP . 'workflow' . SEP . 'inc' . SEP . 'common.inc.php'); 38 require_once(PHPGW_API_INC . SEP . 'class.db.inc.php');39 require_once(PHPGW_SERVER_ROOT . SEP . 'workflow' . SEP . 'inc' . SEP . 'engine' . SEP . 'class.ajax_ldap.inc.php');40 38 require_once(PHPGW_SERVER_ROOT . SEP . 'workflow' . SEP . 'inc' . SEP . 'engine' . SEP . 'class.ajax_config.inc.php'); 41 39 require_once(PHPGW_SERVER_ROOT . SEP . 'workflow' . SEP . 'inc' . SEP . 'engine' . SEP . 'config.ajax.inc.php'); 42 require_once(PHPGW_SERVER_ROOT . SEP . 'workflow' . SEP . 'inc' . SEP . 'class.so_adminaccess.inc.php');43 40 44 41 /** … … 66 63 if (isset($_SESSION['phpgw_info']['workflow']['account_id'])) 67 64 { 68 $GLOBALS['ajax']->ldap = new ajax_ldap();69 $GLOBALS['ajax']->db = &$GLOBALS['workflow']['workflowObjects']->getDBExpresso();65 $GLOBALS['ajax']->ldap = &Factory::getInstance('ajax_ldap'); 66 $GLOBALS['ajax']->db =& Factory::getInstance('WorkflowObjects')->getDBExpresso(); 70 67 $GLOBALS['ajax']->db->Halt_On_Error = 'no'; 71 68 72 $GLOBALS['ajax']->db_workflow = &$GLOBALS['workflow']['workflowObjects']->getDBWorkflow();69 $GLOBALS['ajax']->db_workflow =& Factory::getInstance('WorkflowObjects')->getDBWorkflow(); 73 70 $GLOBALS['ajax']->db_workflow->Halt_On_Error = 'no'; 74 71 75 72 $GLOBALS['phpgw']->ADOdb = &$GLOBALS['ajax']->db->Link_ID; 76 $GLOBALS['ajax']->acl = new so_adminaccess($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);73 $GLOBALS['ajax']->acl = &Factory::getInstance('so_adminaccess', Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID); 77 74 } 78 75 else -
trunk/workflow/inc/class.bo_editor.inc.php
r795 r2591 11 11 12 12 require_once('class.bo_ajaxinterface.inc.php'); 13 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ActivityManager.php');14 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ProcessManager.php');15 13 /** 16 14 * @package Workflow … … 234 232 if ($p['tipo_codigo'] != 'include') 235 233 { 236 $activity_manager = new ActivityManager($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);234 $activity_manager = &Factory::newInstance('ActivityManager'); 237 235 238 236 if ($this->check_process($p['proc_id'], &$activity_manager, &$error_str) == 'n') -
trunk/workflow/inc/class.bo_external_applications.inc.php
r795 r2591 11 11 \**************************************************************************/ 12 12 13 require_once('class.so_external_applications.inc.php');14 13 require_once('class.bo_ajaxinterface.inc.php'); 15 14 /** … … 34 33 { 35 34 parent::bo_ajaxinterface(); 36 $this->so = new so_external_applications();35 $this->so = &Factory::getInstance('so_external_applications'); 37 36 } 38 37 -
trunk/workflow/inc/class.bo_monitors.inc.php
r795 r2591 12 12 require_once('class.bo_ajaxinterface.inc.php'); 13 13 14 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'GUI' . SEP . 'GUI.php'); 15 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ProcessManager.php'); 16 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ActivityManager.php'); 17 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'InstanceManager.php'); 18 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'RoleManager.php'); 19 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessMonitor' . SEP . 'ProcessMonitor.php'); 20 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'API' . SEP . 'Instance.php'); 21 require_once('class.workflow_acl.inc.php'); 22 require_once('class.bo_adminaccess.inc.php'); 23 require_once('class.powergraphic.inc.php'); 14 15 /** 16 * DO NOT remove this line. Ever. Somehow, monitors interface will stop working.. 17 */ 18 require_once(PHPGW_API_INC . SEP . 'common_functions.inc.php'); 19 24 20 25 21 /** … … 134 130 { 135 131 parent::bo_ajaxinterface(); 136 $GLOBALS['ajax']->gui = new GUI($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);132 $GLOBALS['ajax']->gui = &Factory::newInstance('GUI'); 137 133 $this->userID = $_SESSION['phpgw_info']['workflow']['account_id']; 138 134 $this->isWorkflowAdmin = $GLOBALS['ajax']->acl->checkWorkflowAdmin($this->userID); 139 $this->processManager = new ProcessManager($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);140 $this->activityManager = new ActivityManager($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);141 $this->instanceManager = new InstanceManager($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);142 $this->roleManager = new RoleManager($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);143 $this->processMonitor = new ProcessMonitor($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);135 $this->processManager = &Factory::newInstance('ProcessManager'); 136 $this->activityManager = &Factory::newInstance('ActivityManager'); 137 $this->instanceManager = &Factory::newInstance('InstanceManager'); 138 $this->roleManager = &Factory::newInstance('RoleManager'); 139 $this->processMonitor = &Factory::newInstance('ProcessMonitor'); 144 140 } 145 141 … … 169 165 private function convertFiltersToSQL($filters) 170 166 { 171 require_once 'nano/JSON.php';172 167 173 168 /* desserializa os dados */ 174 $JSON = new Services_JSON();169 $JSON = &Factory::newInstance('Services_JSON'); 175 170 /* desserializa a array principal, depois desserializa cada elemento desta array e, por fim, converte os elementos (que estão em forma de objeto) para array associativa */ 176 171 $filters = array_map('get_object_vars', array_map(array($JSON, 'decode'), $JSON->decode($filters))); … … 335 330 $filters[] = '(gia.wf_user IS NOT NULL)'; 336 331 337 $ldap = & $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');332 $ldap = &Factory::getInstance('WorkflowLDAP'); 338 333 if (!$completeData) 339 334 { 340 $paging = $GLOBALS['workflow']['factory']->newInstance('Paging', 500, $_POST);335 $paging = Factory::newInstance('Paging', 500, $_POST); 341 336 $tmp = $this->processMonitor->monitor_list_instances($paging->nextItem, $paging->itemsPerPage, $order, '', implode(' AND ', $filters)); 342 337 $output['data'] = $paging->restrictItems(array_values($tmp['data']), $tmp['cant']); … … 353 348 $activityMapping = array(); 354 349 $instanceCount = count($output['data']); 355 $cachedLDAP = & $GLOBALS['workflow']['factory']->getInstance('CachedLDAP');350 $cachedLDAP = &Factory::getInstance('CachedLDAP'); 356 351 for ($i = 0; $i < $instanceCount; $i++) 357 352 { … … 476 471 /* load the data */ 477 472 $filters[] = '(gp.wf_p_id = ' . $params['pid'] . ')'; 478 $ldap = & $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');473 $ldap = &Factory::getInstance('WorkflowLDAP'); 479 474 if (!$completeData) 480 475 { 481 $paging = $GLOBALS['workflow']['factory']->newInstance('Paging', 500, $_POST);476 $paging = Factory::newInstance('Paging', 500, $_POST); 482 477 $tmp = $this->processMonitor->monitor_list_completed_instances($paging->nextItem, $paging->itemsPerPage, $order, '', implode(' AND ', $filters)); 483 478 $output['data'] = $paging->restrictItems(array_values($tmp['data']), $tmp['cant']); … … 491 486 } 492 487 493 $cachedLDAP = & $GLOBALS['workflow']['factory']->getInstance('CachedLDAP');488 $cachedLDAP = &Factory::getInstance('CachedLDAP'); 494 489 $userMapping = array(); 495 490 $instanceCount = count($output['data']); … … 627 622 } 628 623 else 629 $output['fullname'] = $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getName($user);624 $output['fullname'] = Factory::getInstance('WorkflowLDAP')->getName($user); 630 625 631 626 $this->instanceManager->set_instance_user($params['iid'], $params['aid'], $user); … … 648 643 if ($params['ns'] == 'aborted') 649 644 { 650 $realInstance = new Instance($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);645 $realInstance = &Factory::newInstance('Instance'); 651 646 $realInstance->getInstance($params['iid']); 652 647 if (!empty($realInstance->instanceId)) … … 684 679 685 680 /* use next user or * for the new instance */ 686 $realInstance = new Instance($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);681 $realInstance = &Factory::newInstance('Instance'); 687 682 $realInstance->getInstance($params['iid'], false, false); 688 683 $user = $realInstance->getNextUser($params['aid']); … … 751 746 752 747 $maximumDisplaySize = 100; 753 $instance = new Instance($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);748 $instance = &Factory::newInstance('Instance'); 754 749 $instance->getInstance($params['iid']); 755 750 … … 783 778 return "Você não tem permissão para executar este procedimento!"; 784 779 785 $instance = new Instance($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);780 $instance = &Factory::newInstance('Instance'); 786 781 $instance->getInstance($params['iid']); 787 782 $output = $params; … … 804 799 $maximumDisplaySize = 100; 805 800 806 $instance = new Instance($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);801 $instance = &Factory::newInstance('Instance'); 807 802 $instance->getInstance($params['iid']); 808 803 $instance->set($params['name'], $params['value']); … … 835 830 return "Você não tem permissão para executar este procedimento!"; 836 831 837 $instance = new Instance($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);832 $instance = &Factory::newInstance('Instance'); 838 833 $instance->getInstance($params['iid']); 839 834 $instance->clear($params['name']); … … 858 853 $output = array(); 859 854 $urlPrefix = 'workflow/inc/class.powergraphic.inc.php?'; 860 $powergraphic = new powergraphic;855 $powergraphic = &Factory::getInstance('powergraphic'); 861 856 $powergraphic->graphic_1 = $params['pid']; 862 857 $powergraphic->skin = 1; … … 904 899 /* prepare the data */ 905 900 $aux2 = array(); 906 $ldap = & $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');901 $ldap = &Factory::getInstance('WorkflowLDAP'); 907 902 foreach ($aux as $user => $count) 908 903 $aux2[] = array( … … 984 979 985 980 /* load LDAP info and sort the result */ 986 $foundUsers = $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getNames($users);981 $foundUsers = Factory::getInstance('WorkflowLDAP')->getNames($users); 987 982 usort($foundUsers, create_function('$a,$b', 'return strcasecmp($a[\'name\'],$b[\'name\']);')); 988 983 … … 991 986 if (count($users) > count($foundUsers)) 992 987 { 993 $cachedLDAP = & $GLOBALS['workflow']['factory']->getInstance('CachedLDAP');988 $cachedLDAP = &Factory::getInstance('CachedLDAP'); 994 989 $foundUsersID = array_map(create_function('$a', 'return $a[\'id\'];'), $foundUsers); 995 990 $missingUsers = array_diff($users, $foundUsersID); … … 1242 1237 return $output; 1243 1238 1244 $BOUserInterface = & $GLOBALS['workflow']['factory']->getInstance('bo_userinterface');1239 $BOUserInterface = &Factory::getInstance('bo_userinterface'); 1245 1240 1246 1241 /* initialize some variables */ … … 1344 1339 1345 1340 /* load the recipient e-mail */ 1346 $ldap = & $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');1341 $ldap = &Factory::getInstance('WorkflowLDAP'); 1347 1342 foreach ($output as $key => $value) 1348 1343 { … … 1396 1391 1397 1392 /* prepare the environment to load some configuration values from other module */ 1398 $GLOBALS['phpgw']->db = &$GLOBALS['workflow']['workflowObjects']->getDBExpresso();1399 $GLOBALS['phpgw']->common = CreateObject('phpgwapi.common');1400 $GLOBALS['phpgw']->session = CreateObject('phpgwapi.sessions');1393 $GLOBALS['phpgw']->db =& Factory::getInstance('WorkflowObjects')->getDBExpresso(); 1394 $GLOBALS['phpgw']->common = Factory::getInstance('common'); 1395 $GLOBALS['phpgw']->session = Factory::getInstance('sessions'); 1401 1396 function lang($a){return $a;}; 1402 1397 1403 1398 /* get the required configuration */ 1404 $BOEmailAdmin = $GLOBALS['workflow']['factory']->newForeignInstance('emailadmin','bo');1399 $BOEmailAdmin = Factory::getInstance('bo'); 1405 1400 $profileList = $BOEmailAdmin->getProfileList(); 1406 1401 $profile = $BOEmailAdmin->getProfile($profileList[0]['profileID']); 1402 1403 /** 1404 * XXX - XXX 1405 * It's weird.. There are two almost identical PHPMailer classes. 1406 * The class registered in our factory is under 'EGW_INC_ROOT'. 1407 * The class used here has the same name and it's under another 1408 * directory. For now, let's just include it in the old-fashion 1409 * way, but if someone, someday try to use both classes in the 1410 * same access, it could cause us troubles. 1411 */ 1407 1412 1408 1413 /* configure the PHPMailer class to send the e-mails */ … … 1494 1499 { 1495 1500 $output = array(); 1496 $cachedLDAP = & $GLOBALS['workflow']['factory']->getInstance('CachedLDAP');1497 $ldap = & $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');1501 $cachedLDAP = &Factory::getInstance('CachedLDAP'); 1502 $ldap = &Factory::getInstance('WorkflowLDAP'); 1498 1503 foreach ($userIDs as $userID) 1499 1504 { … … 1542 1547 $filters[] = '(gia.wf_user IS NOT NULL)'; 1543 1548 1544 $cachedLDAP = & $GLOBALS['workflow']['factory']->newInstance('CachedLDAP');1549 $cachedLDAP = &Factory::newInstance('CachedLDAP'); 1545 1550 $cachedLDAP->setOperationMode($cachedLDAP->OPERATION_MODE_LDAP); 1546 1551 $output = array(); … … 1559 1564 } 1560 1565 1561 $validUsers = $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getNames(array_keys($userIDs));1566 $validUsers = Factory::getInstance('WorkflowLDAP')->getNames(array_keys($userIDs)); 1562 1567 array_walk($validUsers, create_function('&$a', '$a = $a[\'id\'];')); 1563 1568 -
trunk/workflow/inc/class.bo_move_instances.inc.php
r795 r2591 12 12 13 13 require_once('class.bo_ajaxinterface.inc.php'); 14 require_once('class.so_move_instances.inc.php');15 require_once('nano/JSON.php');16 14 17 15 … … 39 37 { 40 38 parent::bo_ajaxinterface(); 41 $this->so = new so_move_instances();39 $this->so = &Factory::getInstance('so_move_instances'); 42 40 } 43 41 … … 79 77 function moveInstances($params) 80 78 { 81 $JSON = new Services_JSON();79 $JSON = &Factory::newInstance('Services_JSON'); 82 80 83 81 /* convert the mappgin element to array */ -
trunk/workflow/inc/class.bo_orgchart.inc.php
r2042 r2591 10 10 \**************************************************************************/ 11 11 12 require_once('class.so_orgchart.inc.php');13 12 require_once('class.bo_ajaxinterface.inc.php'); 14 13 /** … … 47 46 { 48 47 parent::bo_ajaxinterface(); 49 $this->so = new so_orgchart();48 $this->so = &Factory::getInstance('so_orgchart'); 50 49 } 51 50 -
trunk/workflow/inc/class.bo_participants.inc.php
r795 r2591 34 34 function bo_participants() 35 35 { 36 $this->ldap = & $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');36 $this->ldap = &Factory::getInstance('WorkflowLDAP'); 37 37 } 38 38 -
trunk/workflow/inc/class.bo_userinterface.inc.php
r2085 r2591 10 10 \**************************************************************************/ 11 11 12 require_once('class.so_userinterface.inc.php');13 12 require_once('class.bo_ajaxinterface.inc.php'); 14 require_once('class.Paging.inc.php'); 15 16 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'GUI' . SEP . 'GUI.php'); 17 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ActivityManager.php'); 13 18 14 /** 19 15 * @package Workflow … … 43 39 function bo_userinterface() 44 40 { 45 parent::bo_ajaxinterface(); 46 $this->so = new so_userinterface();47 $GLOBALS['ajax']->gui = new GUI($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);41 parent::bo_ajaxinterface(); 42 $this->so = &Factory::getInstance('so_userinterface'); 43 $GLOBALS['ajax']->gui = &Factory::newInstance('GUI'); 48 44 } 49 45 … … 68 64 $webserver_url = $_SESSION['phpgw_info']['workflow']['server']['webserver_url']; 69 65 70 $templateServer = &$GLOBALS['workflow']['factory']->getInstance('TemplateServer');66 $templateServer =& Factory::getInstance('TemplateServer'); 71 67 foreach ($result['data'] as $line) 72 68 { … … 120 116 $pid = $params['pid']; 121 117 $result = array(); 122 123 $process = new Process($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);118 119 $process = &Factory::newInstance('Process'); 124 120 $process->getProcess($pid); 125 121 $result['wf_procname'] = $process->name; 126 122 $result['wf_version'] = $process->version; 127 123 $result['wf_description'] = $process->description; 128 129 $activ_manager = new ActivityManager($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);124 125 $activ_manager = &Factory::newInstance('ActivityManager'); 130 126 $result['wf_activities'] = $activ_manager->get_process_activities($pid); 131 132 $this->disconnect_all(); 133 134 return $result; 127 128 $this->disconnect_all(); 129 130 return $result; 135 131 } 136 132 … … 148 144 $itemsPerPage = isset($preferences['ui_items_per_page']) ? $preferences['ui_items_per_page'] : 15; 149 145 $lightVersion = ((isset($preferences['use_light_interface']) ? $preferences['use_light_interface'] : 0) == 1); 150 $paging = new Paging($itemsPerPage, $_POST);146 $paging = Factory::newInstance('Paging', $itemsPerPage, $_POST); 151 147 152 148 /* define the sorting */ … … 263 259 else 264 260 if ($row['wf_user'] != '') 265 $row['wf_user_fullname'] = $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getName($row['wf_user']);261 $row['wf_user_fullname'] = Factory::getInstance('WorkflowLDAP')->getName($row['wf_user']); 266 262 267 263 /* unset unneeded information */ … … 495 491 } 496 492 497 $instance = new Instance($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);493 $instance = &Factory::newInstance('Instance'); 498 494 $instance->getInstance($instanceID); 499 495 500 $process = new Process($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);496 $process = &Factory::newInstance('Process'); 501 497 $process->getProcess($instance->pId); 502 498 … … 508 504 'wf_instance_id' => $instance->instanceId, 509 505 'wf_priority' => $instance->priority, 510 'wf_owner' => $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getName($instance->owner),506 'wf_owner' => Factory::getInstance('WorkflowLDAP')->getName($instance->owner), 511 507 'wf_next_activity' => $instance->nextActivity, 512 'wf_next_user' => $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getName($instance->nextUser),508 'wf_next_user' => Factory::getInstance('WorkflowLDAP')->getName($instance->nextUser), 513 509 'wf_name' => $instance->name, 514 510 'wf_category' => $instance->category, … … 526 522 $result['wf_ended'] = ""; 527 523 528 $ldap = & $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');524 $ldap = &Factory::getInstance('WorkflowLDAP'); 529 525 foreach ($instance->workitems as $line) 530 526 { … … 657 653 $cod_process = array(); 658 654 659 $ldap = & $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');655 $ldap = &Factory::getInstance('WorkflowLDAP'); 660 656 $viewActivitiesID = array(); 661 657 foreach ($result['data'] as $row) … … 726 722 /* paginate the result */ 727 723 $itemsPerPage = isset($_SESSION['phpgw_info']['workflow']['user']['preferences']['ui_items_per_page']) ? $_SESSION['phpgw_info']['workflow']['user']['preferences']['ui_items_per_page'] : 15; 728 $paging = new Paging($itemsPerPage, $_POST);724 $paging = Factory::newInstance('Paging', $itemsPerPage, $_POST); 729 725 $output['instances'] = $paging->restrictItems($output['instances']); 730 726 $output['paging_links'] = $paging->commonLinks(); … … 740 736 /** 741 737 * Aplicacoes externas do usuario 742 * @return array 738 * @return array 743 739 * @access public 744 740 */ … … 746 742 { 747 743 $webserver_url = $_SESSION['phpgw_info']['workflow']['server']['webserver_url']; 748 $templateServer = & $GLOBALS['workflow']['factory']->getInstance('TemplateServer');744 $templateServer = &Factory::getInstance('TemplateServer'); 749 745 750 746 /* load the sites that the user can access */ … … 1070 1066 function callVoipConnect($params) 1071 1067 { 1072 $cachedLDAP = $GLOBALS['workflow']['factory']->newInstance('CachedLDAP');1068 $cachedLDAP = Factory::newInstance('CachedLDAP'); 1073 1069 $cachedLDAP->setOperationMode($cachedLDAP->OPERATION_MODE_LDAP); 1074 1070 -
trunk/workflow/inc/class.bo_utils.inc.php
r795 r2591 11 11 12 12 require_once 'class.bo_ajaxinterface.inc.php'; 13 require_once GALAXIA_LIBRARY . SEP . 'src' . SEP . 'GUI' . SEP . 'GUI.php';14 require_once GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ActivityManager.php';15 13 16 14 /** … … 34 32 { 35 33 parent::bo_ajaxinterface(); 36 $this->db = &$GLOBALS['workflow']['workflowObjects']->getDBExpresso();34 $this->db =& Factory::getInstance('WorkflowObjects')->getDBExpresso(); 37 35 } 38 36 … … 88 86 $ret_name = empty($params['name']) ? 'cn' : $params['name']; 89 87 90 $ajaxConfig = new ajax_config('contactcenter');88 $ajaxConfig = &Factory::newInstance('ajax_config', 'contactcenter'); 91 89 $config = $ajaxConfig->read_repository(); 92 90 -
trunk/workflow/inc/class.bo_workflow_forms.inc.php
r795 r2591 90 90 $this->sort_mode = $this->order . '__' . $this->sort; 91 91 $this->search_str = get_var('find', 'any', ''); 92 $this->nextmatchs = CreateObject('phpgwapi.nextmatchs');92 $this->nextmatchs = Factory::getInstance('nextmatchs'); 93 93 94 94 // number of rows allowed -
trunk/workflow/inc/class.external_bridge.inc.php
r795 r2591 13 13 require_once 'common.inc.php'; 14 14 require_once 'engine/config.egw.inc.php'; 15 require_once 'class.so_adminaccess.inc.php';16 15 17 16 /** … … 52 51 function external_bridge() 53 52 { 54 $this->db = $GLOBALS['workflow']['workflowObjects']->getDBGalaxia();55 $this->acl = new so_adminaccess($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);53 $this->db = Factory::getInstance('WorkflowObjects')->getDBGalaxia(); 54 $this->acl = &Factory::getInstance('so_adminaccess', Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID); 56 55 } 57 56 /** … … 156 155 157 156 /* assign variables to the template */ 158 $smarty = $GLOBALS['workflow']['factory']->getInstance('workflow_smarty', false);157 $smarty = Factory::getInstance('workflow_smarty', false); 159 158 $smarty->assign('encodedForm', $encodedForm); 160 159 $smarty->assign('siteAddress', $this->siteAddress); -
trunk/workflow/inc/class.powergraphic.inc.php
r795 r2591 139 139 140 140 141 142 143 $PowerGraphic = new powergraphic;141 require_once 'common.inc.php'; 142 143 $PowerGraphic = &Factory::newInstance('powergraphic'); 144 144 145 145 $PowerGraphic->start(); -
trunk/workflow/inc/class.run_activity.inc.php
r2072 r2591 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 require_once(dirname(__FILE__) . SEP . 'class.utils.security.php' ); /* sanitizes input data */17 16 18 17 /** … … 169 168 var $agents = Array(); 170 169 171 /* CELEPAR */172 170 /** 173 171 * @var object $smarty holds a Smarty instance … … 195 193 */ 196 194 var $isChildInstance = false; 197 195 /** 196 * @var object Stores a 'workflow_smarty' object 197 * @access private 198 */ 198 199 private $workflowSmarty = null; 199 /* CELEPAR */ 200 200 201 /** 201 202 * Constructor … … 206 207 { 207 208 parent::WorkflowUtils(); 208 $this->runtime = CreateObject('workflow.workflow_wfruntime'); 209 210 /** 211 * We should always use newInstance to instantiate 212 * 'workflow_wfruntime' 213 */ 214 $this->runtime = &Factory::newInstance('workflow_wfruntime'); 209 215 $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'); 213 $this->categories = CreateObject('phpgwapi.categories'); 214 215 $this->workflowSmarty = CreateObject('workflow.workflow_smarty', false); 216 $this->GUI = &Factory::getInstance('workflow_gui'); 217 $this->categories = &Factory::getInstance('categories'); 218 219 $this->workflowSmarty = &Factory::getInstance('workflow_smarty', false); 220 216 221 // TODO: open a new connection to the database under a different username to allow privilege handling on tables 217 /* CELEPAR */218 222 unset($this->db); 219 223 } … … 301 305 $this->process_version = $this->process->getVersion(); 302 306 $this->activity_name = $activity->getName(); 303 $this->user_name = $GLOBALS['phpgw']->accounts->id2name($GLOBALS['user']);307 $this->user_name = $GLOBALS['phpgw']->accounts->id2name($GLOBALS['user']); 304 308 $this->view_activity = $this->GUI->gui_get_process_view_activity($this->process_id); 305 309 … … 318 322 $GLOBALS['workflow']['wf_workflow_path'] = $GLOBALS['phpgw_info']['server']['webserver_url'].SEP.'workflow'; 319 323 $GLOBALS['workflow']['wf_resources_path'] = $GLOBALS['phpgw_info']['server']['webserver_url'] . SEP . 'workflow/redirect.php?pid=' . $this->process_id . '&file='; 320 $GLOBALS['workflow']['wf_default_resources_path'] = $GLOBALS['workflow']['factory']->getInstance('TemplateServer')->generateLink('processes');321 $GLOBALS['workflow']['wf_workflow_resources_path'] = $GLOBALS['workflow']['factory']->getInstance('TemplateServer')->generateLink('');324 $GLOBALS['workflow']['wf_default_resources_path'] = Factory::getInstance('TemplateServer')->generateLink('processes'); 325 $GLOBALS['workflow']['wf_workflow_resources_path'] = Factory::getInstance('TemplateServer')->generateLink(''); 322 326 $GLOBALS['workflow']['wf_activity_url'] = $GLOBALS['phpgw_info']['server']['webserver_url'].SEP.'index.php?menuaction=workflow.'.get_class($this).'.go&activity_id='.$activity_id; 323 $GLOBALS['workflow']['wf_user_cnname'] = $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getName($GLOBALS['user']);327 $GLOBALS['workflow']['wf_user_cnname'] = Factory::getInstance('WorkflowLDAP')->getName($GLOBALS['user']); 324 328 $GLOBALS['workflow']['wf_back_link'] = $GLOBALS['phpgw_info']['server']['webserver_url'].SEP.'workflow'.SEP.'index.php?start_tab=1'; 325 329 $GLOBALS['workflow']['wf_js_path'] = $GLOBALS['phpgw_info']['server']['webserver_url'].SEP.'workflow'.SEP.'js'.SEP.'jscode'; … … 331 335 $wf =& $GLOBALS['workflow']; 332 336 333 /* CELEPAR */334 337 /* path to the local functions developed by Celepar */ 335 338 $functions = PHPGW_SERVER_ROOT . SEP . 'workflow' . SEP . 'inc' . SEP . 'local' . SEP . 'functions' . SEP . 'local.functions.php'; … … 337 340 /* activate local functions */ 338 341 require_once($functions); 339 /* CELEPAR */340 342 341 343 //get configuration options with default values if no init was done before … … 376 378 377 379 /* check some permissions */ 378 if (($newUser == '*') || (!$this->runtime->checkUserRun($newUser)) || ( $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getName($newUser) === false))380 if (($newUser == '*') || (!$this->runtime->checkUserRun($newUser)) || (Factory::getInstance('WorkflowLDAP')->getName($newUser) === false)) 379 381 { 380 382 $_SESSION['phpgw_info']['workflow']['user_groups'] = $actualUserGroups; … … 386 388 return false; 387 389 } 388 $smarty = CreateObject('workflow.process_smarty');390 $smarty = Factory::getInstance('process_smarty'); 389 391 } 390 392 … … 397 399 $this->download_mode = get_var('download_mode', array('POST','GET'), false); 398 400 399 /* #celepar# smarty code*/ 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'; … … 419 419 $smarty->assign('wf_back_link',$GLOBALS['workflow']['wf_back_link']); 420 420 $smarty->assign('wf_activity_url',$GLOBALS['workflow']['wf_activity_url']); 421 421 422 422 /* register the prefilter smarty plugin wf_default_template */ 423 423 $smarty->load_filter('pre', 'wf_default_template'); … … 438 438 $env['instance'] =& $instance; //process manager instance 439 439 $env['activity'] =& $activity; //activity manager instance 440 $security =& new SecurityUtils(); //input sanitizer class440 $security =& Factory::newInstance('SecurityUtils'); //input sanitizer class 441 441 $env['request'] =& $security->process($_REQUEST); //sanitizes input data from client 442 $env['factory'] =& new ProcessFactory();//instantiation controller class442 $env['factory'] =& Factory::getInstance('ProcessWrapperFactory'); //instantiation controller class 443 443 $env['natural'] =& wf_create_object('wf_natural'); //data access object instance for mainframe 444 444 /* END WORKFLOW MVC SETTINGS */ 445 445 446 446 $GLOBALS['workflow_env'] = &$env; 447 //echo "<br><br><br><br><br>Including $source <br>In request: <pre>";print_r($_REQUEST);echo "</pre>"; 448 //[__leave_activity] is setted if needed in the xxx_pre code or by the user in his code 449 // HERE the user code is 'executed'. Note that we do not use include_once or require_once because 450 //it could the same code several times with automatic activities looping in the graph and it still 451 //need to be executed 447 448 /** 449 * [__leave_activity] is setted if needed in the xxx_pre code or by the user in his code 450 * HERE the user code is 'executed'. Note that we do not use include_once or require_once because 451 * it could the same code several times with automatic activities looping in the graph and it still 452 * need to be executed 453 */ 452 454 $_engineProcessCodeDirectory = GALAXIA_PROCESSES . SEP . $this->process->getNormalizedName(). SEP . 'code'; 453 455 $_engineCompilerDirectory = GALAXIA_LIBRARY . SEP . 'compiler'; … … 472 474 473 475 /* activate the security policy */ 474 $GLOBALS['workflow']['factory']->getInstance('WorkflowSecurity')->enableSecurityPolicy(); 476 Factory::getInstance('WorkflowSecurity')->enableSecurityPolicy(); 477 478 /** 479 * Here we are going to use our new Security static class. 480 * From now, the factory frontend (static) will forward 481 * the messages for the process factory instead of Workflow 482 * factory. 483 */ 484 Security::enable(); 475 485 476 486 /* include the files */ … … 661 671 $GLOBALS['workflow']['wf_workflow_path'] = $GLOBALS['phpgw_info']['server']['webserver_url'].SEP.'workflow'; 662 672 $GLOBALS['workflow']['wf_resources_path'] = $GLOBALS['phpgw_info']['server']['webserver_url'] . SEP . 'workflow/redirect.php?pid=' . $this->process_id . '&file='; 663 $GLOBALS['workflow']['wf_default_resources_path'] = $GLOBALS['workflow']['factory']->getInstance('TemplateServer')->generateLink('processes');664 $GLOBALS['workflow']['wf_workflow_resources_path'] = $GLOBALS['workflow']['factory']->getInstance('TemplateServer')->generateLink('');673 $GLOBALS['workflow']['wf_default_resources_path'] = Factory::getInstance('TemplateServer')->generateLink('processes'); 674 $GLOBALS['workflow']['wf_workflow_resources_path'] = Factory::getInstance('TemplateServer')->generateLink(''); 665 675 $GLOBALS['workflow']['wf_activity_url'] = $GLOBALS['phpgw_info']['server']['webserver_url'].SEP.'index.php?menuaction=workflow.'.get_class($this).'.go&activity_id='.$activity_id; 666 $GLOBALS['workflow']['wf_user_cnname'] = $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getName($GLOBALS['user']);676 $GLOBALS['workflow']['wf_user_cnname'] = Factory::getInstance('WorkflowLDAP')->getName($GLOBALS['user']); 667 677 $GLOBALS['workflow']['wf_back_link'] = $GLOBALS['phpgw_info']['server']['webserver_url'].SEP.'workflow'.SEP.'index.php?start_tab=1'; 668 678 $GLOBALS['workflow']['wf_js_path'] = $GLOBALS['phpgw_info']['server']['webserver_url'].SEP.'workflow'.SEP.'js'.SEP.'jscode'; … … 673 683 unset($GLOBALS['workflow']['wf_instance_url']); 674 684 675 /* CELEPAR */676 685 /* activate local functions */ 677 686 require_once(PHPGW_SERVER_ROOT . SEP . 'workflow' . SEP . 'inc' . SEP . 'local' . SEP . 'functions' . SEP . 'local.functions.php'); 678 /* CELEPAR */679 687 680 688 //get configuration options with default values if no init was done before … … 699 707 $env['instance'] =& $instance; //process manager instance 700 708 $env['activity'] =& $activity; //activity manager instance 701 $security =& new SecurityUtils();//input sanitizer class709 $security =& Factory::newInstance('SecurityUtils'); //input sanitizer class 702 710 $env['request'] =& $security->process($_REQUEST); //sanitizes input data from client 703 $env['factory'] =& new ProcessFactory();//instantiation controller class711 $env['factory'] =& Factory::newInstance('ProcessWrapperFactory'); //instantiation controller class 704 712 $env['natural'] =& wf_create_object('wf_natural'); //data access object instance for mainframe 705 713 /* END WORKFLOW MVC SETTINGS */ … … 712 720 713 721 /* activate the security policy */ 714 $GLOBALS['workflow']['factory']->getInstance('WorkflowSecurity')->enableSecurityPolicy(); 722 Factory::getInstance('WorkflowSecurity')->enableSecurityPolicy(); 723 724 /** 725 * here we are going to use our new Security static class. 726 * From now, the factory frontend (static) will forward 727 * the messages for the process factory instead of Workflow 728 * factory. Note that this is the same comment as the previous 729 * function... boooring.. =} 730 */ 731 Security::enable(); 715 732 716 733 $GLOBALS['workflow_env'] = &$env; 717 $nc = new NanoController();734 $nc = &Factory::newInstance('NanoController'); 718 735 $nc->setClassPath(GALAXIA_PROCESSES . SEP . $this->process->getNormalizedName(). SEP . 'code'); 719 736 $nc->iterateOverVirtualRequests(); -
trunk/workflow/inc/class.so_adminaccess.inc.php
r795 r2591 77 77 { 78 78 $output = array(); 79 $names = $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getNames($userIDs);79 $names = Factory::getInstance('WorkflowLDAP')->getNames($userIDs); 80 80 foreach ($names as $name) 81 81 $output[] = array( … … 201 201 if (!is_object($GLOBALS['phpgw']->acl)) 202 202 { 203 $GLOBALS['phpgw']->db = &$GLOBALS['workflow']['workflowObjects']->getDBExpresso();204 $GLOBALS['phpgw']->acl = &$GLOBALS['workflow']['factory']->getForeignInstance('phpgwapi','acl', $userID);203 $GLOBALS['phpgw']->db =& Factory::getInstance('WorkflowObjects')->getDBExpresso(); 204 $GLOBALS['phpgw']->acl =& Factory::getInstance('acl', $userID); 205 205 } 206 206 -
trunk/workflow/inc/class.so_adminjobs.inc.php
r795 r2591 10 10 \**************************************************************************/ 11 11 12 require_once GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ProcessManager.php';13 require_once GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'JobManager.php';14 require_once GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ActivityManager.php';15 12 16 13 /** … … 96 93 $this->isAdmin = $_SESSION['phpgw_info']['workflow']['user_is_admin']; 97 94 $this->acl = &$GLOBALS['ajax']->acl; 98 $this->db = & $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID;99 $this->jobManager = new JobManager(&$this->db);95 $this->db = &Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID; 96 $this->jobManager = &Factory::newInstance('JobManager'); 100 97 } 101 98 … … 229 226 $output = array(); 230 227 $job = $this->jobManager->getJob($jobID); 231 $jobScheduler = &$GLOBALS['workflow']['factory']->getInstance('JobScheduler');228 $jobScheduler =& Factory::getInstance('JobScheduler'); 232 229 $totalTime = microtime(true); 233 230 $thread = $jobScheduler->execute($job, true); -
trunk/workflow/inc/class.so_agent.inc.php
r795 r2591 26 26 { 27 27 //public functions 28 28 29 29 /** 30 30 * @var array $public_functions Array of public functions 31 * @access public 31 * @access public 32 32 */ 33 33 var $public_functions = array( … … 36 36 ); 37 37 /** 38 * @var array $wf_table 38 * @var array $wf_table 39 39 * @access public 40 40 */ 41 41 var $wf_table = 'egw_wf_agent_'; 42 42 /** 43 * @var string $agent_table 43 * @var string $agent_table 44 44 * @access public 45 45 */ 46 46 var $agent_table = ''; 47 47 48 48 // link to the global db-object 49 49 50 50 /** 51 * @var object $db objeto para conexao do banco de dados 51 * @var object $db objeto para conexao do banco de dados 52 52 * @access public 53 53 */ 54 54 var $db; 55 55 56 56 /** 57 57 * Constructor of the so_agent class 58 58 * do not forget to call it (parent::so_agent();) in child classes 59 59 * @access public 60 * @return object 60 * @return object 61 61 */ 62 62 63 63 function so_agent() 64 64 { 65 $this->db =& $GLOBALS['workflow']['workflowObjects']->getDBGalaxia();65 $this->db =& Factory::getInstance('WorkflowObjects')->getDBGalaxia(); 66 66 } 67 67 68 68 /** 69 69 * @abstract read all agent datas from the database -
trunk/workflow/inc/class.so_external_applications.inc.php
r795 r2591 130 130 $this->isAdmin = $_SESSION['phpgw_info']['workflow']['user_is_admin']; 131 131 $this->acl = &$GLOBALS['ajax']->acl; 132 $this->db = &$GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID;132 $this->db =& Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID; 133 133 $this->EXTERNAL_APPLICATION_PATH = $_SESSION['phpgw_info']['workflow']['server']['files_dir'] . '/workflow//workflow/external_applications'; 134 134 } -
trunk/workflow/inc/class.so_move_instances.inc.php
r795 r2591 11 11 \**************************************************************************/ 12 12 13 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ProcessManager.php');14 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ActivityManager.php');15 13 16 14 /** … … 91 89 $this->userID = $_SESSION['phpgw_info']['workflow']['account_id']; 92 90 $this->isAdmin = $_SESSION['phpgw_info']['workflow']['user_is_admin']; 93 $this->acl = &$GLOBALS['ajax']->acl;94 $this->db = &$GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID;91 $this->acl =& $GLOBALS['ajax']->acl; 92 $this->db =& Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID; 95 93 } 96 94 … … 113 111 $where[] = 'wf_p_id IS NULL'; 114 112 } 115 $processManager = new ProcessManager($this->db);113 $processManager = &Factory::getInstance('ProcessManager'); 116 114 117 115 /* workaround to sort the result using two columns */ … … 137 135 $this->_checkAccess($processID); 138 136 139 $activityManager = new ActivityManager($this->db);137 $activityManager = &Factory::newInstance('ActivityManager'); 140 138 $activities = $activityManager->list_activities($processID, 0, -1, 'wf_name__ASC', '', 'wf_type <> \'standalone\' AND wf_type <> \'view\''); 141 139 $output = array(); -
trunk/workflow/inc/class.so_orgchart.inc.php
r2063 r2591 127 127 $this->isAdmin = $_SESSION['phpgw_info']['workflow']['user_is_admin']; 128 128 $this->acl = &$GLOBALS['ajax']->acl; 129 $this->db = & $GLOBALS['workflow']['workflowObjects']->getDBWorkflow()->Link_ID;130 $this->db = & $GLOBALS['workflow']['workflowObjects']->getDBWorkflow()->Link_ID;129 $this->db = &Factory::getInstance('WorkflowObjects')->getDBWorkflow()->Link_ID; 130 $this->db = &Factory::getInstance('WorkflowObjects')->getDBWorkflow()->Link_ID; 131 131 $this->db->SetFetchMode(ADODB_FETCH_ASSOC); 132 132 } … … 711 711 712 712 $output = $result->GetArray(-1); 713 $cachedLDAP = $GLOBALS['workflow']['factory']->newInstance('CachedLDAP');713 $cachedLDAP = Factory::newInstance('CachedLDAP'); 714 714 $cachedLDAP->setOperationMode($cachedLDAP->OPERATION_MODE_LDAP_DATABASE); 715 715 for ($i = 0; $i < count($output); $i++) … … 765 765 766 766 /* search for the $searchTerm in the LDAP */ 767 $ldap = & $GLOBALS['workflow']['workflowObjects']->getLDAP();768 $list = @ldap_search($ldap, $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getLDAPContext(), $ldapSearch, array('uidnumber', 'cn', 'uid'));767 $ldap = &Factory::getInstance('WorkflowObjects')->getLDAP(); 768 $list = @ldap_search($ldap, Factory::getInstance('WorkflowLDAP')->getLDAPContext(), $ldapSearch, array('uidnumber', 'cn', 'uid')); 769 769 if ($list === false) 770 770 die(serialize("O sistema de busca não pode ser utilizado nesta organização.")); … … 774 774 775 775 /* search for the $searchTerm in the DB */ 776 $resultSet = $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID->query($DBSearch, $DBValues)->GetArray(-1);776 $resultSet = Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID->query($DBSearch, $DBValues)->GetArray(-1); 777 777 foreach ($resultSet as $row) 778 778 if (!isset($unifiedResult[$row['uidnumber']])) … … 823 823 { 824 824 $errors = array( 825 "O funcionário \"" . $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getName($employeeID) . "\" já pertença à área \"{$row['sigla']}\".",825 "O funcionário \"" . Factory::getInstance('WorkflowLDAP')->getName($employeeID) . "\" já pertença à área \"{$row['sigla']}\".", 826 826 '-----------------', 827 827 'Caso você queira colocá-lo na área selecionada, siga o procedimento: faça uma busca por seu nome, clique para editá-lo e, troque pela área desejada.' … … 881 881 { 882 882 $errors = array( 883 "O funcionário \"" . $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getName($employeeID) . "\" é titular, substituto, já participou de substituição ou é auxiliar administrativo das seguintes áreas: " . implode(", ", $areas),883 "O funcionário \"" . Factory::getInstance('WorkflowLDAP')->getName($employeeID) . "\" é titular, substituto, já participou de substituição ou é auxiliar administrativo das seguintes áreas: " . implode(", ", $areas), 884 884 '-----------------', 885 885 'Se você quiser excluir este funcionário, precisa removê-lo dos "cargos" que ele possui nas áreas citadas.' … … 919 919 $this->_checkError($result); 920 920 921 $ldap = & $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');921 $ldap = &Factory::getInstance('WorkflowLDAP'); 922 922 while ($row = $result->fetchRow(DB_FETCHMODE_ASSOC)) 923 923 { … … 999 999 $query = 'SELECT 1 FROM funcionario WHERE (funcionario_id = ?)'; 1000 1000 if (!$this->db->query($query, $checkEmployee)->fetchRow()) 1001 $errors[] = "O funcionário \"" . $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getName($checkEmployee) . "\" não está vinculado a uma área.";1001 $errors[] = "O funcionário \"" . Factory::getInstance('WorkflowLDAP')->getName($checkEmployee) . "\" não está vinculado a uma área."; 1002 1002 } 1003 1003 … … 1044 1044 $query = 'SELECT 1 FROM funcionario WHERE (funcionario_id = ?)'; 1045 1045 if (!$this->db->query($query, $checkEmployee)->fetchRow()) 1046 $errors[] = "O funcionário \"" . $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getName($checkEmployee) . "\" não está vinculado a uma área.";1046 $errors[] = "O funcionário \"" . Factory::getInstance('WorkflowLDAP')->getName($checkEmployee) . "\" não está vinculado a uma área."; 1047 1047 } 1048 1048 … … 1091 1091 $this->_checkAccess($organizationID, false, true); 1092 1092 1093 /** 1094 * This is so wrong.. We should always use the factory to 1095 * instantiate stuff. Besides, module class should not 1096 * use process classes; the correct is to do the inverse. 1097 */ 1093 1098 require_once dirname(__FILE__) . '/local/classes/class.wf_orgchart.php'; 1094 1099 $orgchart = new wf_orgchart(); … … 1096 1101 $outputInfo = array(); 1097 1102 1098 $cachedLDAP = $GLOBALS['workflow']['factory']->newInstance('CachedLDAP');1103 $cachedLDAP = Factory::newInstance('CachedLDAP'); 1099 1104 1100 1105 /* here we need fresh information. Let's access ldap first */ … … 1262 1267 ); 1263 1268 1264 $cachedLDAP = $GLOBALS['workflow']['factory']->newInstance('CachedLDAP');1269 $cachedLDAP = Factory::newInstance('CachedLDAP'); 1265 1270 $cachedLDAP->setOperationMode($cachedLDAP->OPERATION_MODE_LDAP_DATABASE); 1266 1271 if (!empty($areaInfo['titular_funcionario_id'])) … … 1512 1517 1513 1518 /* we must query ldap to get full user names. In workflow db we just store uids */ 1514 $cachedLDAP = $GLOBALS['workflow']['factory']->newInstance('CachedLDAP'); 1515 1516 $cachedLDAP->getEntryByID(); 1519 $cachedLDAP = Factory::getInstance('CachedLDAP'); 1517 1520 1518 1521 $output = $result->GetArray(-1); -
trunk/workflow/inc/class.so_userinterface.inc.php
r2094 r2591 1 1 <?php 2 require_once($_SESSION['phpgw_info']['workflow']['phpgw_api_inc'] . '/class.config.inc.php');3 2 4 3 /** … … 22 21 function so_userinterface() 23 22 { 24 $this->db = &$GLOBALS['workflow']['workflowObjects']->getDBWorkflow()->Link_ID;23 $this->db =& Factory::getInstance('WorkflowObjects')->getDBWorkflow()->Link_ID; 25 24 $this->db->SetFetchMode(ADODB_FETCH_ASSOC); 26 25 } … … 61 60 $oldDB = $GLOBALS['phpgw']->db; 62 61 $GLOBALS['phpgw']->db = $GLOBALS['ajax']->db; 63 $config = new config('workflow');62 $config = &Factory::getInstance('config', 'workflow'); 64 63 $configValues = $config->read_repository(); 65 64 $submasksString = $configValues['intranet_subnetworks']; … … 93 92 if (!empty($externalApplicationsID)) 94 93 { 95 $result = $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID->query("SELECT DISTINCT external_application_id, name, address, image, authentication, intranet_only FROM egw_wf_external_application WHERE (external_application_id IN (" . implode(', ', $externalApplicationsID) . ")) ORDER BY name");94 $result = Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID->query("SELECT DISTINCT external_application_id, name, address, image, authentication, intranet_only FROM egw_wf_external_application WHERE (external_application_id IN (" . implode(', ', $externalApplicationsID) . ")) ORDER BY name"); 96 95 $preOutput = $result->GetArray(-1); 97 96 … … 245 244 246 245 $employees = $result->GetArray(-1); 247 $cachedLDAP = $GLOBALS['workflow']['factory']->newInstance('CachedLDAP');246 $cachedLDAP = Factory::newInstance('CachedLDAP'); 248 247 $cachedLDAP->setOperationMode($cachedLDAP->OPERATION_MODE_NORMAL); 249 248 $categoriesCount = array(); … … 318 317 319 318 $employees = $result->GetArray(-1); 320 $cachedLDAP = $GLOBALS['workflow']['factory']->newInstance('CachedLDAP');319 $cachedLDAP = Factory::newInstance('CachedLDAP'); 321 320 $cachedLDAP->setOperationMode($cachedLDAP->OPERATION_MODE_NORMAL); 322 321 for ($i = 0; $i < count($employees); $i++) … … 352 351 { 353 352 /* get ldap connection */ 354 $ldap = & $GLOBALS['workflow']['workflowObjects']->getLDAP();353 $ldap = &Factory::getInstance('WorkflowObjects')->getLDAP(); 355 354 356 355 $searchTermExploded = explode(" ", $searchTerm); … … 370 369 371 370 /* searching employees by name in the ldap server */ 372 $list = @ldap_search($ldap, $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getLDAPContext(), ('(&(cn=*' . $searchTerm . '*)(phpgwaccounttype=u))'), array('uidNumber', 'cn', 'telephoneNumber'));371 $list = @ldap_search($ldap, Factory::getInstance('WorkflowLDAP')->getLDAPContext(), ('(&(cn=*' . $searchTerm . '*)(phpgwaccounttype=u))'), array('uidNumber', 'cn', 'telephoneNumber')); 373 372 if ($list === false) 374 373 return false; … … 432 431 { 433 432 /* get ldap connection */ 434 $ldap = & $GLOBALS['workflow']['workflowObjects']->getLDAP();433 $ldap = &Factory::getInstance('WorkflowObjects')->getLDAP(); 435 434 436 435 /* makes no sense search for an area if the string has more than one word */ … … 466 465 467 466 /* executing it */ 468 $list = @ldap_search($ldap, $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getLDAPContext(), $ldap_query, array('uidNumber', 'cn', 'telephoneNumber'));467 $list = @ldap_search($ldap, Factory::getInstance('WorkflowLDAP')->getLDAPContext(), $ldap_query, array('uidNumber', 'cn', 'telephoneNumber')); 469 468 $entries = ldap_get_entries($ldap, $list); 470 469 … … 475 474 476 475 /* we will need to search into database 'cache' for users deleted in ldap */ 477 $cachedLDAP = $GLOBALS[ 'workflow' ][ 'factory' ] ->newInstance( 'CachedLDAP' );476 $cachedLDAP = Factory::newInstance( 'CachedLDAP' ); 478 477 $cachedLDAP -> setOperationMode( $cachedLDAP -> OPERATION_MODE_DATABASE ); 479 478 … … 528 527 529 528 /* get ldap connection */ 530 $ldap = & $GLOBALS['workflow']['workflowObjects']->getLDAP();529 $ldap = &Factory::getInstance('WorkflowObjects')->getLDAP(); 531 530 532 531 /* searching employees by telephoneNumber in the ldap server */ 533 $list = @ldap_search($ldap, $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getLDAPContext(), ('(&(telephoneNumber=*' . $searchTerm . '*)(phpgwaccounttype=u))'), array('uidNumber', 'cn', 'telephoneNumber'));532 $list = @ldap_search($ldap, Factory::getInstance('WorkflowLDAP')->getLDAPContext(), ('(&(telephoneNumber=*' . $searchTerm . '*)(phpgwaccounttype=u))'), array('uidNumber', 'cn', 'telephoneNumber')); 534 533 535 534 if (!$list) return false; … … 594 593 function getEmployeeInfo($employeeID, $organizationID) 595 594 { 596 require_once dirname(__FILE__) . '/class.so_orgchart.inc.php'; 597 598 $SOOrgchart = new so_orgchart(); 595 $SOOrgchart = &Factory::getInstance('so_orgchart'); 599 596 $SOOrgchart->setExternalCalls(true); 600 597 $output = $SOOrgchart->getEmployeeInfo($employeeID, $organizationID); … … 614 611 function getAreaInfo($areaID, $organizationID) 615 612 { 616 require_once dirname(__FILE__) . '/class.so_orgchart.inc.php'; 617 618 $SOOrgchart = new so_orgchart(); 613 $SOOrgchart = &Factory::getInstance('so_orgchart'); 619 614 $SOOrgchart->setExternalCalls(true); 620 615 $output = $SOOrgchart->getAreaInfo($areaID, $organizationID); … … 652 647 $result = $this -> db -> query( "SELECT a.sigla as area, a.titular_funcionario_id as titular, s.funcionario_id as substituto, s.data_inicio, s.data_fim FROM area a INNER JOIN substituicao s ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) WHERE (organizacao_id = ?) ORDER BY area", array( $organizationID ) ); 653 648 654 $cachedLDAP = $GLOBALS[ 'workflow' ][ 'factory' ] ->newInstance( 'CachedLDAP' );649 $cachedLDAP = Factory::newInstance( 'CachedLDAP' ); 655 650 $cachedLDAP -> setOperationMode( $cachedLDAP -> OPERATION_MODE_LDAP_DATABASE ); 656 651 … … 719 714 720 715 $employees = $result -> GetArray( -1 ); 721 $cachedLDAP = $GLOBALS[ 'workflow' ][ 'factory' ] ->newInstance( 'CachedLDAP' );716 $cachedLDAP = Factory::newInstance( 'CachedLDAP' ); 722 717 $cachedLDAP -> setOperationMode( $cachedLDAP -> OPERATION_MODE_NORMAL ); 723 718 … … 791 786 $employees = $result -> GetArray( -1 ); 792 787 793 $cachedLDAP = $GLOBALS[ 'workflow' ][ 'factory' ] ->newInstance( 'CachedLDAP' );788 $cachedLDAP = Factory::newInstance( 'CachedLDAP' ); 794 789 $cachedLDAP -> setOperationMode( $cachedLDAP -> OPERATION_MODE_NORMAL ); 795 790 … … 817 812 usort( $employees, create_function( '$a,$b', 'return strcasecmp($a[\'cn\'],$b[\'cn\']);' ) ); 818 813 819 $paging = $GLOBALS['workflow']['factory']->newInstance('Paging', 50, $_POST);814 $paging = Factory::newInstance('Paging', 50, $_POST); 820 815 $employees = $paging->restrictItems( $employees ); 821 816 -
trunk/workflow/inc/class.ui_adminaccess.inc.php
r795 r2591 41 41 function ui_adminaccess() 42 42 { 43 if (! $GLOBALS['workflow']['factory']->getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']))43 if (!Factory::getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id'])) 44 44 { 45 45 $GLOBALS['phpgw']->common->phpgw_header(); … … 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(); -
trunk/workflow/inc/class.ui_adminactivities.inc.php
r1710 r2591 2 2 3 3 require_once dirname(__FILE__) . SEP . 'class.WorkflowUtils.inc.php'; 4 require_once dirname(__FILE__) . SEP . 'class.fsutils.inc.php'; /* toolkit for filesystem handling */5 4 require_once 'engine' . SEP . 'config.egw.inc.php'; 6 5 /** … … 73 72 parent::WorkflowUtils(); 74 73 75 $this->workflow_acl = CreateObject('workflow.workflow_acl');74 $this->workflow_acl = Factory::getInstance('workflow_acl'); 76 75 $denyAccess = true; 77 76 if ($this->workflow_acl->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id'])) … … 106 105 } 107 106 108 $this->process_manager = CreateObject('workflow.workflow_processmanager');109 $this->activity_manager = CreateObject('workflow.workflow_activitymanager');110 $this->role_manager = CreateObject('workflow.workflow_rolemanager');111 $this->fs = new FsUtils(); /* gets instance */107 $this->process_manager = Factory::getInstance('workflow_processmanager'); 108 $this->activity_manager = Factory::getInstance('workflow_activitymanager'); 109 $this->role_manager = Factory::getInstance('workflow_rolemanager'); 110 $this->fs = &Factory::newInstance('FsUtils'); /* gets instance */ 112 111 113 112 } … … 374 373 // fill proc_bar 375 374 $this->t->set_var('proc_bar', $this->fill_proc_bar($proc_info)); 376 375 377 376 //collect some messages from used objects 378 377 $this->message[] = $this->activity_manager->get_error(false, _DEBUG); … … 380 379 $this->message[] = $this->role_manager->get_error(false, _DEBUG); 381 380 382 $templateServer = & $GLOBALS['workflow']['factory']->getInstance('TemplateServer');381 $templateServer = &Factory::getInstance('TemplateServer'); 383 382 384 383 // fill the general variables of the template … … 732 731 $this->translate_template('block_process_activities_header'); 733 732 $this->t->parse('process_activities_header', 'block_process_activities_header', True); 734 $templateServer = & $GLOBALS['workflow']['factory']->getInstance('TemplateServer');733 $templateServer = &Factory::getInstance('TemplateServer'); 735 734 foreach ($process_activities_data as $activity) 736 735 { … … 792 791 'trans_href_from' => $GLOBALS['phpgw']->link('/index.php', 'menuaction=workflow.ui_adminactivities.form&where2='. $where2 .'&sort_mode2='. $sort_mode2 .'&p_id='. $this->wf_p_id .'&find='. $find .'&where='. $where .'&sort_mode='. $this->sort_mode .'&activity_id='. $transition['wf_act_from_id']), 793 792 'trans_actFromName' => $transition['wf_act_from_name'], 794 'trans_arrow' => $GLOBALS['workflow']['factory']->getInstance('TemplateServer')->generateImageLink('next.gif'),793 'trans_arrow' => Factory::getInstance('TemplateServer')->generateImageLink('next.gif'), 795 794 'trans_href_to' => $GLOBALS['phpgw']->link('/index.php', 'menuaction=workflow.ui_adminactivities.form&where2='. $where2 .'&sort_mode2='. $sort_mode2 .'&p_id='. $this->wf_p_id .'&find='. $find .'&where='. $where .'&sort_mode='. $this->sort_mode .'&activity_id='. $transition['wf_act_to_id']), 796 795 'trans_actToName' => $transition['wf_act_to_name'], … … 1036 1035 $image_name = $proc_info['wf_normalized_name'] . SEP . 'graph' . SEP . $proc_info['wf_normalized_name'] . '.png'; 1037 1036 $image = GALAXIA_PROCESSES . SEP . $image_name; 1038 if ( $GLOBALS['workflow']['factory']->getInstance('BrowserInfo')->isOpera())1037 if (Factory::getInstance('BrowserInfo')->isOpera()) 1039 1038 $maximumDimension = 1000000; 1040 1039 else … … 1069 1068 } 1070 1069 } 1071 1070 1072 1071 /** 1073 1072 * Dislays the activity agents config rows … … 1090 1089 } 1091 1090 $this->translate_template('admin_agents'); 1092 1091 $this->t->parse('agents_config_rows', 'admin_agents'); 1093 1092 } 1094 1093 } -
trunk/workflow/inc/class.ui_adminjobs.inc.php
r795 r2591 41 41 'app_header' => $GLOBALS['phpgw_info']['apps']['workflow']['title'] . ' - ' . lang('Jobs') 42 42 ); 43 $smarty = & $GLOBALS['workflow']['factory']->getInstance('workflow_smarty');43 $smarty = &Factory::getInstance('workflow_smarty'); 44 44 45 45 $javaScripts = $this->get_common_js(); … … 54 54 $css .= $this->get_css_link('adminjobs'); 55 55 56 $processInfo = $GLOBALS['workflow']['factory']->getInstance('workflow_processmanager')->get_process((int) $_REQUEST['p_id']);56 $processInfo = Factory::getInstance('workflow_processmanager')->get_process((int) $_REQUEST['p_id']); 57 57 $smarty->assign('processNameVersion', "{$processInfo['wf_name']} v{$processInfo['wf_version']}"); 58 58 $smarty->assign('processID', (int) $processInfo['wf_p_id']); -
trunk/workflow/inc/class.ui_adminprocesses.inc.php
r989 r2591 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'); … … 127 127 } 128 128 129 if (! $GLOBALS['workflow']['factory']->getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']))129 if (!Factory::getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id'])) 130 130 { 131 131 $proc_ids = $this->workflow_acl->get_granted_processes($GLOBALS['phpgw_info']['user']['account_id']); … … 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 … … 589 589 590 590 $myp_id = $item['wf_p_id']; 591 $templateServer = & $GLOBALS['workflow']['factory']->getInstance('TemplateServer');591 $templateServer = &Factory::getInstance('TemplateServer'); 592 592 $this->t->set_var(array( 593 593 'item_wf_p_id' => $myp_id, -
trunk/workflow/inc/class.ui_adminroles.inc.php
r795 r2591 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 … … 254 254 $this->t->set_var('list_mappings', '<tr><td colspan="3" align="center">'. lang('There are no mappings defined for this process') .'</td></tr>'); 255 255 } 256 else { 256 else { 257 257 /* load the LDAP information */ 258 $cachedLDAP = $GLOBALS['workflow']['factory']->getInstance('CachedLDAP');259 $tmpLDAP = & $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');258 $cachedLDAP = Factory::getInstance('CachedLDAP'); 259 $tmpLDAP = &Factory::getInstance('WorkflowLDAP'); 260 260 $userContext = $tmpLDAP->getUserContext(); 261 261 $groupContext = $tmpLDAP->getGroupContext(); … … 264 264 { 265 265 if ($mapping['wf_account_type'] == 'g') { 266 $sri = ldap_search( $GLOBALS['workflow']['workflowObjects']->getLDAP(),267 $groupContext, 266 $sri = ldap_search(Factory::getInstance('WorkflowObjects')->getLDAP(), 267 $groupContext, 268 268 '(&(gidnumber=' . (int)$mapping['wf_user'] . ')(phpgwAccountType=g))'); 269 270 $allValues = ldap_get_entries( $GLOBALS['workflow']['workflowObjects']->getLDAP(), $sri);271 269 270 $allValues = ldap_get_entries(Factory::getInstance('WorkflowObjects')->getLDAP(), $sri); 271 272 272 $cname = $GLOBALS['phpgw']->translation->convert($allValues[0]['cn'][0],'utf-8'); 273 273 $glabel = '[' . lang('Group') . ']'; … … 280 280 $glabel = '<font color="red">(excluído)</font>'; 281 281 } 282 282 283 283 $this->t->set_var(array( 284 284 'map_user_id' => $mapping['wf_user'], … … 313 313 * Show users roles selects 314 314 * @param string $all_roles_data 315 * @return 315 * @return 316 316 */ 317 317 function show_users_roles_selects($all_roles_data) 318 318 { 319 $templateServer = & $GLOBALS['workflow']['factory']->getInstance('TemplateServer');319 $templateServer = &Factory::getInstance('TemplateServer'); 320 320 $imgaddusers = $templateServer->generateImageLink('add_group.png'); 321 321 $imgdelusers = $templateServer->generateImageLink('delete_group.png'); … … 325 325 'src_img_del_users' => $imgdelusers 326 326 )); 327 327 328 328 $this->t->set_block('admin_roles', 'block_select_roles', 'select_roles'); 329 329 foreach ($all_roles_data as $role) -
trunk/workflow/inc/class.ui_adminsource.inc.php
r795 r2591 17 17 */ 18 18 require_once dirname(__FILE__) . SEP . 'class.ui_ajaxinterface.inc.php'; 19 require_once dirname(__FILE__) . SEP . 'class.workflow_acl.inc.php';20 19 require_once 'engine' . SEP . 'config.ajax.inc.php'; 21 20 … … 43 42 function ui_adminsource() 44 43 { 45 $this->workflow_acl = new workflow_acl();44 $this->workflow_acl = Factory::getInstance('workflow_acl'); 46 45 $denyAccess = true; 47 46 if ($this->workflow_acl->checkWorkflowAdmin($_SESSION['phpgw_info']['workflow']['account_id'])) … … 78 77 function form() 79 78 { 80 $smarty = $GLOBALS['workflow']['factory']->getInstance('workflow_smarty', false);79 $smarty = Factory::getInstance('workflow_smarty', false); 81 80 $smarty->setHeader(workflow_smarty::SHOW_HEADER | workflow_smarty::SHOW_NAVIGATION_BAR | workflow_smarty::SHOW_FOOTER, $GLOBALS['phpgw_info']['apps']['workflow']['title'] . ' - ' . lang('Admin Processes Sources')); 82 81 -
trunk/workflow/inc/class.ui_agent_mail_smtp.inc.php
r795 r2591 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 -
trunk/workflow/inc/class.ui_ajaxinterface.inc.php
r1452 r2591 11 11 \**************************************************************************/ 12 12 13 require_once 'class.workflow_acl.inc.php';14 13 require_once 'common.inc.php'; 15 14 require_once 'engine/class.ajax_config.inc.php'; … … 50 49 function set_wf_session() 51 50 { 52 $acl = new workflow_acl();51 $acl = Factory::getInstance('workflow_acl'); 53 52 $_SESSION['phpgw_info']['workflow']['server_root'] = PHPGW_SERVER_ROOT; 54 53 $_SESSION['phpgw_info']['workflow']['phpgw_api_inc'] = PHPGW_API_INC; … … 56 55 $vfs = createobject('phpgwapi.vfs'); 57 56 $_SESSION['phpgw_info']['workflow']['vfs_basedir'] = $vfs->basedir; 58 $_SESSION['phpgw_info']['workflow']['server'] = $GLOBALS['phpgw_info']['server']; 57 $_SESSION['phpgw_info']['workflow']['server'] = $GLOBALS['phpgw_info']['server']; 59 58 $_SESSION['phpgw_info']['workflow']['lang'] = $GLOBALS['lang']; 60 59 $_SESSION['phpgw_info']['workflow']['account_id'] = $GLOBALS['phpgw_info']['user']['account_id']; 61 $_SESSION['phpgw_info']['workflow']['user_groups'] = $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getUserGroups($GLOBALS['phpgw_info']['user']['account_id']);60 $_SESSION['phpgw_info']['workflow']['user_groups'] = Factory::getInstance('WorkflowLDAP')->getUserGroups($GLOBALS['phpgw_info']['user']['account_id']); 62 61 $user_is_admin = $acl->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']); 63 $_SESSION['phpgw_info']['workflow']['user_is_admin'] = $user_is_admin; 62 $_SESSION['phpgw_info']['workflow']['user_is_admin'] = $user_is_admin; 64 63 $_SESSION['phpgw_info']['workflow']['user_can_admin_process'] = ($user_is_admin || ($GLOBALS['phpgw']->acl->check('admin_workflow',1,'workflow'))); 65 $_SESSION['phpgw_info']['workflow']['user_can_admin_instance'] = ($user_is_admin || ($GLOBALS['phpgw']->acl->check('admin_instance_workflow',1,'workflow'))); 64 $_SESSION['phpgw_info']['workflow']['user_can_admin_instance'] = ($user_is_admin || ($GLOBALS['phpgw']->acl->check('admin_instance_workflow',1,'workflow'))); 66 65 67 66 $can_monitor = $acl->checkUserGroupAccessToType('MON', $GLOBALS['phpgw_info']['user']['account_id']); … … 118 117 { 119 118 $CSSName = "css/{$CSSName}.css"; 120 $templateServer = & $GLOBALS['workflow']['factory']->getInstance('TemplateServer');119 $templateServer = &Factory::getInstance('TemplateServer'); 121 120 $CSSLink = $templateServer->getWebFile($CSSName); 122 121 $CSSFile = $templateServer->getSystemFile($CSSName); -
trunk/workflow/inc/class.ui_external_applications.inc.php
r795 r2591 49 49 function draw() 50 50 { 51 if (! $GLOBALS['workflow']['factory']->getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']))51 if (!Factory::getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id'])) 52 52 { 53 53 $GLOBALS['phpgw']->common->phpgw_header(); … … 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(); -
trunk/workflow/inc/class.ui_generic_select.inc.php
r795 r2591 79 79 function form() 80 80 { 81 $smarty = $GLOBALS['workflow']['factory']->getInstance('workflow_smarty', false);81 $smarty = Factory::getInstance('workflow_smarty', false); 82 82 $smarty->setHeader(workflow_smarty::SHOW_HEADER | workflow_smarty::SHOW_FOOTER); 83 83 -
trunk/workflow/inc/class.ui_monitors.inc.php
r795 r2591 12 12 13 13 require_once(dirname(__FILE__) . SEP . 'class.ui_ajaxinterface.inc.php'); 14 require_once(dirname(__FILE__) . SEP . 'class.workflow_acl.inc.php');15 14 /** 16 15 * @package Workflow … … 37 36 { 38 37 $this->set_wf_session(); 39 $this->workflow_acl = new workflow_acl();38 $this->workflow_acl = Factory::getInstance('workflow_acl'); 40 39 41 40 if (!($this->workflow_acl->checkUserGroupAccessToType('MON', $_SESSION['phpgw_info']['workflow']['account_id']) || ($this->workflow_acl->checkWorkflowAdmin($_SESSION['phpgw_info']['workflow']['account_id'])))) … … 58 57 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['workflow']['title'] . ' - ' . lang('%1 monitoring'); 59 58 $GLOBALS['phpgw_info']['flags'] = array('noheader' => false, 'nonavbar' => false, 'currentapp' => 'workflow'); 60 $smarty = CreateObject('workflow.workflow_smarty');59 $smarty = Factory::getInstance('workflow_smarty'); 61 60 62 61 $javaScripts = $this->get_common_js(); -
trunk/workflow/inc/class.ui_move_instances.inc.php
r795 r2591 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(); -
trunk/workflow/inc/class.ui_orgchart.inc.php
r795 r2591 1 1 <?php 2 2 3 3 /**************************************************************************\ 4 4 * eGroupWare * 5 5 * http://www.egroupware.org * … … 12 12 13 13 require_once(dirname(__FILE__) . SEP . 'class.ui_ajaxinterface.inc.php'); 14 require_once(dirname(__FILE__) . SEP . 'class.workflow_acl.inc.php'); 14 15 15 /** 16 16 * @package Workflow … … 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(); … … 104 104 die(); 105 105 106 require_once(dirname(__FILE__) . SEP . 'engine' . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'GraphViz.php'); 107 108 $config_values = CreateObject('phpgwapi.config','workflow'); 106 $config_values = Factory::getInstance('config', 'workflow'); 109 107 $config_values->read_repository(); 110 $conf_db = $config_values->config_data; 111 $db = CreateObject('phpgwapi.db');108 $conf_db = $config_values->config_data; 109 $db = Factory::getInstance('db'); 112 110 $db->connect( 113 111 $conf_db['database_name'], … … 122 120 $attributes['ranksep'] = '1.5 equally'; 123 121 $attributes['rankdir'] = 'LR'; 124 $graph = new Process_GraphViz(true, $attributes);122 $graph = &Factory::getInstance('Process_GraphViz', true, $attributes); 125 123 126 124 … … 153 151 return false; 154 152 155 $ldap = & $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');153 $ldap = &Factory::getInstance('WorkflowLDAP'); 156 154 for ($i = 0; $i < count($output); $i++) 157 155 { -
trunk/workflow/inc/class.ui_participants.inc.php
r795 r2591 41 41 function ui_participants() 42 42 { 43 $this->bo = $GLOBALS['workflow']['factory']->getInstance('bo_participants');43 $this->bo = Factory::getInstance('bo_participants'); 44 44 } 45 45 … … 51 51 function form() 52 52 { 53 $smarty = $GLOBALS['workflow']['factory']->getInstance('workflow_smarty', false);53 $smarty = Factory::getInstance('workflow_smarty', false); 54 54 $smarty->setHeader(workflow_smarty::SHOW_HEADER | workflow_smarty::SHOW_FOOTER); 55 $ldap = $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');55 $ldap = Factory::getInstance('WorkflowLDAP'); 56 56 $userDN = $GLOBALS['phpgw_info']['user']['account_dn']; 57 $account = $GLOBALS['workflow']['factory']->getForeignInstance('phpgwapi','accounts', $userDN);57 $account = Factory::getInstance('accounts', $userDN); 58 58 $organizationList = $this->bo->getOrganizations(); 59 59 -
trunk/workflow/inc/class.ui_phpeditor.inc.php
r795 r2591 11 11 12 12 require_once dirname(__FILE__) . SEP . 'engine' . SEP . 'config.ajax.inc.php'; 13 require_once GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ProcessManager.php';14 13 require_once dirname(__FILE__) . SEP . 'class.ui_ajaxinterface.inc.php'; 15 14 /** … … 45 44 function ui_phpeditor() 46 45 { 47 $this->bo = CreateObject('workflow.bo_editor');46 $this->bo = Factory::getInstance('bo_editor'); 48 47 $this->loadVariables(); 49 48 } … … 62 61 function form() 63 62 { 64 $smarty = $GLOBALS['workflow']['factory']->getInstance('workflow_smarty', false);65 $processManager = new ProcessManager($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);63 $smarty = Factory::getInstance('workflow_smarty', false); 64 $processManager = &Factory::newInstance('ProcessManager'); 66 65 $proccessInfo = $processManager->get_process($_GET['proc_id']); 67 66 -
trunk/workflow/inc/class.ui_userinterface.inc.php
r2107 r2591 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');47 $smarty = Factory::getInstance('workflow_smarty'); 48 48 49 49 // Check if workflow config is ok … … 114 114 115 115 // Get a connection to db workflow and galaxia (module) 116 if ( $GLOBALS['workflow']['workflowObjects']->getDBWorkflow()->Error)116 if (Factory::getInstance('WorkflowObjects')->getDBWorkflow()->Error) 117 117 $errors[] = 'Unable to connect to database Workflow'; 118 118 119 if ($errormsg = $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Error)119 if ($errormsg = Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Error) 120 120 $errors[] = 'Unable to connect to database Galaxia'; 121 121 … … 129 129 130 130 /* create some objects */ 131 require_once 'class.so_userinterface.inc.php'; 132 $so = new so_userinterface(); 133 $smarty = CreateObject('workflow.workflow_smarty'); 131 $so = &Factory::getInstance('so_userinterface'); 132 $smarty = &Factory::getInstance('workflow_smarty'); 134 133 135 134 /* get the user's organization */ -
trunk/workflow/inc/class.workflow_acl.inc.php
r795 r2591 30 30 function workflow_acl() 31 31 { 32 parent::so_adminaccess( $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);32 parent::so_adminaccess(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID); 33 33 } 34 34 -
trunk/workflow/inc/class.workflow_activitymanager.inc.php
r795 r2591 5 5 6 6 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ActivityManager.php'); 7 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'GraphViz.php');8 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ProcessManager.php');9 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'common' . SEP . 'WfSecurity.php');10 7 /** 11 8 * @package Workflow … … 20 17 function workflow_activitymanager() 21 18 { 22 parent::ActivityManager( $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);19 parent::ActivityManager(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID); 23 20 } 24 21 } -
trunk/workflow/inc/class.workflow_baseactivity.inc.php
r795 r2591 17 17 function workflow_baseactivity() 18 18 { 19 parent::BaseActivity( $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);19 parent::BaseActivity(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID); 20 20 } 21 21 } -
trunk/workflow/inc/class.workflow_gui.inc.php
r795 r2591 5 5 6 6 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'GUI' . SEP . 'GUI.php'); 7 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'API' . SEP . 'Process.php'); 8 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'API' . SEP . 'Instance.php'); 9 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'common' . SEP . 'WfSecurity.php'); 7 10 8 /** 11 9 * @package Workflow … … 20 18 function workflow_gui() 21 19 { 22 parent::GUI( $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);20 parent::GUI(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID); 23 21 } 24 22 } -
trunk/workflow/inc/class.workflow_instance.inc.php
r795 r2591 6 6 7 7 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'API' . SEP . 'Instance.php'); 8 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'common' . SEP . 'WfSecurity.php');9 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ActivityManager.php');10 8 /** 11 9 * @package Workflow … … 20 18 function workflow_Instance() 21 19 { 22 parent::Instance( $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);20 parent::Instance(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID); 23 21 } 24 22 } -
trunk/workflow/inc/class.workflow_instancemanager.inc.php
r795 r2591 17 17 function workflow_instancemanager() 18 18 { 19 parent::InstanceManager( $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);19 parent::InstanceManager(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID); 20 20 } 21 21 } -
trunk/workflow/inc/class.workflow_process.inc.php
r795 r2591 16 16 function workflow_process() 17 17 { 18 parent::Process( $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);18 parent::Process(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID); 19 19 } 20 20 } -
trunk/workflow/inc/class.workflow_processmanager.inc.php
r795 r2591 5 5 6 6 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ProcessManager.php'); 7 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'RoleManager.php'); 8 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ActivityManager.php'); 9 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'API' . SEP . 'Process.php'); 7 10 8 /** 11 9 * @package Workflow … … 26 24 'database_user', 27 25 'database_password' 28 ); 26 ); 29 27 /** 30 28 * Constructor … … 34 32 function workflow_processmanager() 35 33 { 36 parent::ProcessManager( $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);37 $this->workflow_acl = CreateObject('workflow.workflow_acl');38 34 parent::ProcessManager(); 35 $this->workflow_acl = Factory::getInstance('workflow_acl'); 36 39 37 /* allow regular users to see the process graph */ 40 38 if ($_GET['menuaction'] == "workflow.ui_adminactivities.show_graph") … … 62 60 function import_process(&$data) 63 61 { 64 if (!(isset($this->activity_manager))) $this->activity_manager = new ActivityManager($this->db);62 if (!(isset($this->activity_manager))) $this->activity_manager = &Factory::newInstance('ActivityManager'); 65 63 66 64 if (parent::import_process($data)) … … 121 119 function serialize_process($pId) 122 120 { 123 if (!(isset($this->activity_manager))) $this->activity_manager = new ActivityManager($this->db);121 if (!(isset($this->activity_manager))) $this->activity_manager = &Factory::newInstance('ActivityManager'); 124 122 if (!isset($this->jobManager)) 125 $this->jobManager = new JobManager($this->db);123 $this->jobManager = &Factory::newInstance('JobManager'); 126 124 127 125 //if (!(isset($this->activity_manager))) $this->activity_manager = new ActivityManager($this->db); -
trunk/workflow/inc/class.workflow_processmonitor.inc.php
r795 r2591 17 17 function workflow_processmonitor() 18 18 { 19 parent::ProcessMonitor( $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);19 parent::ProcessMonitor(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID); 20 20 } 21 21 } -
trunk/workflow/inc/class.workflow_rolemanager.inc.php
r795 r2591 17 17 function workflow_rolemanager() 18 18 { 19 parent::RoleManager( $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);19 parent::RoleManager(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID); 20 20 } 21 21 } -
trunk/workflow/inc/class.workflow_smarty.inc.php
r1227 r2591 11 11 12 12 require_once 'smarty/Smarty.class.php'; 13 //require_once 'class.ui_ajaxinterface.inc.php';14 13 15 14 /** -
trunk/workflow/inc/class.workflow_wfruntime.inc.php
r795 r2591 18 18 function workflow_wfruntime() 19 19 { 20 parent::WfRuntime( $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);20 parent::WfRuntime(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID); 21 21 } 22 22 } -
trunk/workflow/inc/class.workflow_wfsecurity.inc.php
r1712 r2591 18 18 function workflow_wfsecurity() 19 19 { 20 parent::WfSecurity( $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);20 parent::WfSecurity(Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID); 21 21 } 22 22 } -
trunk/workflow/inc/common.inc.php
r1484 r2591 1 1 <?php 2 if (file_exists(dirname(__FILE__) . '/../../header.session.inc.php')) { 3 require_once dirname(__FILE__) . '/../../header.session.inc.php'; 2 /**************************************************************************\ 3 * eGroupWare * 4 * http://www.egroupware.org * 5 * -------------------------------------------- * 6 * This program is free software; you can redistribute it and/or modify it * 7 * under the terms of the GNU General Public License as published by the * 8 * Free Software Foundation; either version 2 of the License, or (at your * 9 * option) any later version. * 10 \**************************************************************************/ 11 12 /** 13 * Server base path. This constant is somewhat simililar to 14 * 'PHPGW_SERVER_ROOT'. Nevertheless, there are cases that we 15 * access Workflow directly and it must be defined somewhere. 16 * Recently discovered, when we are runnnig jobs HTTP_SERVER_VARS 17 * exported by apache are not available. 18 * Therefore, we are using this workaround here, setting 19 * EGW_SERVER_ROOT based on the location of this file. This constant 20 * should be updated properly every time we move this file. 21 * @name EGW_SERVER_ROOT 22 */ 23 define('EGW_SERVER_ROOT', dirname(dirname(dirname(__FILE__)))); 24 //define('EGW_SERVER_ROOT', $GLOBALS['HTTP_SERVER_VARS']['DOCUMENT_ROOT']); 25 26 /** 27 * Server include base path. We must define our own constants 28 * because there are several cases in which workflow is called 29 * directly, thus PHPGW constants are not defined. 30 * @name EGW_INC_ROOT 31 */ 32 define('EGW_INC_ROOT', EGW_SERVER_ROOT . '/phpgwapi/inc/'); 33 34 /** 35 * Workflow base path. 36 * @name WF_SERVER_ROOT 37 */ 38 define('WF_SERVER_ROOT', EGW_SERVER_ROOT.'/workflow/'); 39 40 /** 41 * Workflow include path. 42 * @name WF_INC_ROOT 43 */ 44 define('WF_INC_ROOT', WF_SERVER_ROOT.'/inc/'); 45 46 /** 47 * Workflow lib base dir. 48 * @name WF_LIB_ROOT 49 */ 50 define('WF_LIB_ROOT', WF_SERVER_ROOT.'/lib/'); 51 52 53 if (file_exists(EGW_SERVER_ROOT . '/header.session.inc.php')) { 54 require_once EGW_SERVER_ROOT . '/header.session.inc.php'; 4 55 } 5 56 6 /* garante que durante a execução de funções que modificam strings, os 7 * caracteres acentuados sejam tratados corretamente (e.g. strtoupper) 8 */ 57 58 /* assure that the correct encondig will be used (e.g string functions) */ 9 59 setlocale(LC_CTYPE, 'pt_BR', 'pt_BR.iso-8859-1', 'pt_BR.utf-8'); 60 10 61 11 62 /* define o umask para a criação de arquivos por parte do Workflow */ 12 63 umask(007); 13 64 14 require_once dirname(__FILE__) . '/class.factory.inc.php';15 65 16 /** 17 * Objeto que implementa uma Factory 18 * @global object $GLOBALS['workflow']['factory'] 19 * @name $factory 20 */ 21 $GLOBALS['workflow']['factory'] = new Factory(); 22 23 /** 24 * Objeto que cria objetos voltados exclusivamente para o módulo Workflow 25 * @global object $GLOBALS['workflow']['workflowObjects'] 26 * @name $workflowObjects 27 */ 28 $GLOBALS['workflow']['workflowObjects'] = $GLOBALS['workflow']['factory']->newInstance('WorkflowObjects'); 66 /* including common classes */ 67 require_once WF_LIB_ROOT . 'security/Security.php'; 68 require_once WF_LIB_ROOT . 'factory/Factory.php'; 69 require_once WF_LIB_ROOT . 'factory/BaseFactory.php'; 70 require_once WF_LIB_ROOT . 'factory/WorkflowFactory.php'; 71 require_once WF_LIB_ROOT . 'factory/ProcessFactory.php'; 29 72 ?> -
trunk/workflow/inc/engine/class.ajax_config.inc.php
r795 r2591 45 45 } 46 46 47 $this->db = &$GLOBALS['workflow']['workflowObjects']->getDBExpresso();47 $this->db =& Factory::getInstance('WorkflowObjects')->getDBExpresso(); 48 48 $this->appname = $appname; 49 49 } … … 51 51 /** 52 52 * Reads the whole repository for $this->appname, appname has to be set via the constructor 53 * 53 * 54 54 * @return array the whole config-array for that app 55 55 * @access public -
trunk/workflow/inc/engine/class.ajax_ldap.inc.php
r795 r2591 29 29 function ajax_ldap() 30 30 { 31 $tmpLDAP = & $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');31 $tmpLDAP = &Factory::getInstance('WorkflowLDAP'); 32 32 $this->user_context = $tmpLDAP->getUserContext(); 33 33 $this->group_context = $tmpLDAP->getGroupContext(); 34 34 35 $this->ds = &$GLOBALS['workflow']['workflowObjects']->getLDAP();35 $this->ds =& Factory::getInstance('WorkflowObjects')->getLDAP(); 36 36 } 37 37 … … 83 83 function id2fullname($account_id) 84 84 { 85 return $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getName($account_id);85 return Factory::getInstance('WorkflowLDAP')->getName($account_id); 86 86 } 87 87 … … 107 107 $accountID = $_SESSION['phpgw_info']['workflow']['account_id']; 108 108 109 $ldap = &$GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');109 $ldap =& Factory::getInstance('WorkflowLDAP'); 110 110 if (count($output = $ldap->getUserGroups($accountID)) == 0) 111 111 return false; -
trunk/workflow/inc/engine/config.ajax.inc.php
r795 r2591 170 170 if ($loadGroups) 171 171 { 172 $memberships = $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getUserGroups($user);172 $memberships = Factory::getInstance('WorkflowLDAP')->getUserGroups($user); 173 173 if ($user == $_SESSION['phpgw_info']['workflow']['account_id']) 174 174 $_SESSION['phpgw_info']['workflow']['user_groups'] = $memberships; … … 196 196 { 197 197 /* get information regarding the members of the group */ 198 $ldap = & $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');198 $ldap = &Factory::getInstance('WorkflowLDAP'); 199 199 $members = $ldap->getGroupUsers($group); 200 200 … … 256 256 function galaxia_get_config_values($parameters=array()) 257 257 { 258 $config = new ajax_config();258 $config = &Factory::getInstance('ajax_config'); 259 259 $config->read_repository(); 260 260 -
trunk/workflow/inc/engine/config.egw.inc.php
r795 r2591 151 151 function galaxia_user_can_admin_process() 152 152 { 153 return ( $GLOBALS['workflow']['factory']->getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']) || $GLOBALS['phpgw']->acl->check('admin_workflow', 1, 'workflow'));153 return (Factory::getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']) || $GLOBALS['phpgw']->acl->check('admin_workflow', 1, 'workflow')); 154 154 } 155 155 } … … 165 165 function galaxia_user_can_admin_instance() 166 166 { 167 return ( $GLOBALS['workflow']['factory']->getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']) || $GLOBALS['phpgw']->acl->check('admin_instance_workflow', 1, 'workflow'));167 return (Factory::getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']) || $GLOBALS['phpgw']->acl->check('admin_instance_workflow', 1, 'workflow')); 168 168 } 169 169 } … … 179 179 function galaxia_user_can_clean_instances() 180 180 { 181 return ( $GLOBALS['workflow']['factory']->getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']) || $GLOBALS['phpgw']->acl->check('cleanup_workflow', 1, 'workflow'));181 return (Factory::getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']) || $GLOBALS['phpgw']->acl->check('cleanup_workflow', 1, 'workflow')); 182 182 } 183 183 } … … 191 191 function galaxia_user_can_clean_aborted_instances() 192 192 { 193 return ( $GLOBALS['workflow']['factory']->getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']) || $GLOBALS['phpgw']->acl->check('cleanup_aborted_workflow', 1, 'workflow'));193 return (Factory::getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']) || $GLOBALS['phpgw']->acl->check('cleanup_aborted_workflow', 1, 'workflow')); 194 194 } 195 195 } … … 203 203 function galaxia_user_can_monitor() 204 204 { 205 return ( $GLOBALS['workflow']['factory']->getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']) || $GLOBALS['phpgw']->acl->check('monitor_workflow', 1, 'workflow'));205 return (Factory::getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']) || $GLOBALS['phpgw']->acl->check('monitor_workflow', 1, 'workflow')); 206 206 } 207 207 } … … 221 221 $user = $GLOBALS['phpgw_info']['user']['account_id']; 222 222 223 $memberships = $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getUserGroups($user);223 $memberships = Factory::getInstance('WorkflowLDAP')->getUserGroups($user); 224 224 225 225 if ($memberships === false) … … 245 245 { 246 246 /* get information regarding the members of the group */ 247 $members = & $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getGroupUsers($group);247 $members = &Factory::getInstance('WorkflowLDAP')->getGroupUsers($group); 248 248 249 249 /* checl for error in the LDAP query */ … … 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('run_activity'); 308 308 $data = $run_activity->go($activityId, $iid, $auto); 309 309 return $data; … … 325 325 function galaxia_get_config_values($parameters=array()) 326 326 { 327 $config = CreateObject('phpgwapi.config');327 $config = Factory::getInstance('config'); 328 328 $config->read_repository(); 329 329 -
trunk/workflow/inc/engine/src/API/BaseActivity.php
r795 r2591 97 97 * @access public 98 98 */ 99 function BaseActivity( &$db)99 function BaseActivity() 100 100 { 101 101 $this->type='base'; 102 102 $this->child_name = 'BaseActivity'; 103 parent::Base( $db);103 parent::Base(); 104 104 } 105 105 … … 122 122 if(!$result || !$result->numRows() ) return false; 123 123 $res = $result->fetchRow(); 124 124 125 switch($res['wf_type']) { 125 126 case 'start': 126 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'Start.php');127 $act = new Start($this->db);128 break; 127 $act = &Factory::newInstance('Start'); 128 break; 129 129 130 case 'end': 130 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'End.php');131 $act = new End($this->db);132 break; 131 $act = &Factory::newInstance('End'); 132 break; 133 133 134 case 'join': 134 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'Join.php');135 $act = new Join($this->db);136 break; 135 $act = &Factory::newInstance('Join'); 136 break; 137 137 138 case 'split': 138 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'Split.php');139 $act = new Split($this->db);140 break; 139 $act = &Factory::newInstance('Split'); 140 break; 141 141 142 case 'standalone': 142 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'Standalone.php');143 $act = new Standalone($this->db);144 break; 143 $act = &Factory::newInstance('Standalone'); 144 break; 145 145 146 case 'view': 146 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'View.php');147 $act = new View($this->db);148 break; 147 $act = &Factory::newInstance('View'); 148 break; 149 149 150 case 'switch': 150 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'SwitchActivity.php');151 $act = new SwitchActivity($this->db);152 break; 151 $act = &Factory::newInstance('SwitchActivity'); 152 break; 153 153 154 case 'activity': 154 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'activities'.SEP.'Activity.php');155 $act = new Activity($this->db);156 break; 155 $act = &Factory::newInstance('Activity'); 156 break; 157 157 158 default: 158 159 trigger_error('Unknown activity type:'.$res['wf_type'],E_USER_WARNING); 159 160 } 160 161 161 162 $act->setName($res['wf_name']); 162 163 $act->setProcessId($res['wf_p_id']); -
trunk/workflow/inc/engine/src/API/Instance.php
r795 r2591 1 1 <?php 2 2 require_once (GALAXIA_LIBRARY.SEP.'src'.SEP.'common'.SEP.'Base.php'); 3 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'common' . SEP . 'WfSecurity.php');4 3 require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ActivityManager.php'); 5 4 … … 141 140 142 141 var $activityID = null; 143 function Instance( $db)142 function Instance() 144 143 { 145 144 $this->child_name = 'Instance'; 146 parent::Base( $db);145 parent::Base(); 147 146 } 148 147 … … 1171 1170 1172 1171 //lock rows and ensure access is granted 1173 if (!(isset($this->security))) $this->security = & new WfSecurity($this->db);1172 if (!(isset($this->security))) $this->security = &Factory::getInstance('WfSecurity'); 1174 1173 if (!($this->security->checkUserAction($activityId,$this->instanceId,'complete'))) 1175 1174 { … … 1551 1550 { 1552 1551 //we check rights for this user on the next activity 1553 if (!(isset($this->security))) $this->security = & new WfSecurity($this->db);1552 if (!(isset($this->security))) $this->security = &Factory::getInstance('WfSecurity'); 1554 1553 if ($this->security->checkUserAccess($the_next_user,$activityId)) 1555 1554 { … … 1560 1559 { 1561 1560 // then check to see if there is a default user 1562 $activity_manager = & new ActivityManager($this->db);1561 $activity_manager = &Factory::newInstance('ActivityManager'); 1563 1562 //get_default_user will give us '*' if there is no default_user or if the default user has no role 1564 1563 //mapped anymore -
trunk/workflow/inc/engine/src/API/Process.php
r795 r2591 48 48 * @access public 49 49 */ 50 function Process( &$db)50 function Process() 51 51 { 52 52 $this->child_name = 'Process'; 53 parent::Base( $db);53 parent::Base(); 54 54 } 55 55 -
trunk/workflow/inc/engine/src/API/activities/Activity.php
r795 r2591 16 16 * @access public 17 17 */ 18 function Activity( &$db)18 function Activity() 19 19 { 20 parent::Base( $db);20 parent::Base(); 21 21 $this->child_name = 'Activity'; 22 22 } -
trunk/workflow/inc/engine/src/API/activities/End.php
r795 r2591 15 15 * @access public 16 16 */ 17 function End( &$db)17 function End() 18 18 { 19 parent::Base( $db);19 parent::Base(); 20 20 $this->child_name = 'End'; 21 21 } -
trunk/workflow/inc/engine/src/API/activities/Join.php
r795 r2591 15 15 * @access public 16 16 */ 17 function Join( &$db)17 function Join() 18 18 { 19 parent::Base( $db);19 parent::Base(); 20 20 $this->child_name = 'Join'; 21 21 } -
trunk/workflow/inc/engine/src/API/activities/Split.php
r795 r2591 15 15 * @access public 16 16 */ 17 function Split( &$db)17 function Split() 18 18 { 19 parent::Base( $db);19 parent::Base(); 20 20 $this->child_name = 'Split'; 21 21 } -
trunk/workflow/inc/engine/src/API/activities/Standalone.php
r795 r2591 15 15 * @access public 16 16 */ 17 function Standalone( &$db)17 function Standalone() 18 18 { 19 parent::Base( $db);19 parent::Base(); 20 20 $this->child_name = 'Standalone'; 21 21 } -
trunk/workflow/inc/engine/src/API/activities/Start.php
r795 r2591 15 15 * @access public 16 16 */ 17 function Start( &$db)17 function Start() 18 18 { 19 parent::Base( $db);19 parent::Base(); 20 20 $this->child_name = 'Start'; 21 21 } -
trunk/workflow/inc/engine/src/API/activities/SwitchActivity.php
r795 r2591 16 16 * @access public 17 17 */ 18 function SwitchActivity( &$db)18 function SwitchActivity() 19 19 { 20 parent::Base( $db);20 parent::Base(); 21 21 $this->child_name = 'Switch'; 22 22 } -
trunk/workflow/inc/engine/src/API/activities/View.php
r795 r2591 16 16 * @access public 17 17 */ 18 function View( &$db)18 function View() 19 19 { 20 parent::Base( $db);20 parent::Base(); 21 21 $this->child_name = 'View'; 22 22 } -
trunk/workflow/inc/engine/src/GUI/GUI.php
r795 r2591 32 32 * @access public 33 33 */ 34 function GUI( &$db)34 function GUI() 35 35 { 36 36 $this->child_name = 'GUI'; 37 parent::Base($db); 38 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'common'.SEP.'WfSecurity.php'); 39 $this->wf_security =& new WfSecurity($this->db); 37 parent::Base(); 38 $this->wf_security = &Factory::getInstance('WfSecurity'); 40 39 } 41 40 … … 703 702 if (!(isset($this->pm))) 704 703 { 705 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'ProcessManager'.SEP.'ProcessManager.php'); 706 $this->pm =& new ProcessManager($this->db); 704 $this->pm = &Factory::newInstance('ProcessManager'); 707 705 } 708 706 $this->process_cache[$pId]['view'] = $this->pm->get_process_view_activity($pId); … … 871 869 { 872 870 //the security object said everything was fine 873 $instance = new Instance($this->db);871 $instance = &Factory::newInstance('Instance'); 874 872 $instance->getInstance($instanceId); 875 873 if (!empty($instance->instanceId)) … … 975 973 { 976 974 //the security object said everything was fine 977 $instance = & new Instance($this->db);975 $instance = &Factory::newInstance('Instance'); 978 976 $instance->getInstance($instanceId); 979 977 // we force the execution of the activity … … 1012 1010 { 1013 1011 //the security object said everything was fine 1014 $instance = & new Instance($this->db);1012 $instance = &Factory::newInstance('Instance'); 1015 1013 $instance->getInstance($instanceId); 1016 1014 // we force the continuation of the flow -
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 -
trunk/workflow/inc/engine/src/ProcessMonitor/ProcessMonitor.php
r795 r2591 18 18 * @access public 19 19 */ 20 function ProcessMonitor( &$db)20 function ProcessMonitor() 21 21 { 22 22 $this->child_name = 'ProcessMonitor'; 23 parent::Base( $db);23 parent::Base(); 24 24 // check the the actual user can really do this 25 25 if ( !(galaxia_user_can_monitor())) -
trunk/workflow/inc/engine/src/common/Base.php
r2195 r2591 39 39 var $child_name = 'Base'; 40 40 41 /** 42 * @var object $db_shared_obj The database abstraction object shared between 43 * all instances of this class. 44 * @acess private 45 * @static 46 */ 47 private static $db_shared_obj = null; 48 41 49 /** 42 50 * Constructor receiving a database abstraction object … … 46 54 * @access public 47 55 */ 48 function Base( &$db)56 function Base() 49 57 { 50 if(!$db) { 58 /** 59 * New Stuff! 60 * We decided to get here the database object. In a recent past, 61 * all the classes that specialize this one passed a db object. 62 * Now, to simplify and save memory, we store the database object 63 * into a single and static atribute shared among each instance 64 * of this class. 65 * 66 * To prevent to modify all sub-classes to use "self::$db" instead 67 * of "this->db", we made a very tiny workaround here. In the first 68 * instantiation of this class, we instantiate the database object 69 * and store it into 'self::$db_shared_obj'. Any subsequent 70 * instantiations will just point to the static one. 71 */ 72 if (!self::$db_shared_obj) 73 self::$db_shared_obj = &Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID; 74 75 $this->db = &self::$db_shared_obj; 76 77 78 if(!$this->db) { 51 79 die('Invalid db object passed to '.$this->child_name.' constructor'); 52 80 } 53 81 //Force transactionnal mysql (Innodb) -> mysqlt 54 if ($ db->databaseType=='mysql')82 if ($this->db->databaseType=='mysql') 55 83 { 56 84 $GLOBALS['phpgw']->db->disconnect(); 57 $ db = $GLOBALS['phpgw']->db->connect(85 $this->db = $GLOBALS['phpgw']->db->connect( 58 86 $GLOBALS['phpgw_info']['server']['db_name'], 59 87 $GLOBALS['phpgw_info']['server']['db_host'], … … 64 92 ); 65 93 } 66 $this->db = &$db;67 94 } 68 95 -
trunk/workflow/inc/engine/src/common/WfRuntime.php
r795 r2591 86 86 * @access public 87 87 */ 88 function WfRuntime( &$db)88 function WfRuntime() 89 89 { 90 90 $this->child_name = 'WfRuntime'; 91 parent::Base($db); 92 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'BaseActivity.php'); 93 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'Process.php'); 94 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'Instance.php'); 95 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'common'.SEP.'WfSecurity.php'); 96 91 parent::Base(); 92 97 93 //first the activity is not set 98 94 $this->activity = null; 99 $this->instance = new Instance($this->db);100 $this->process = new Process($this->db);101 $this->security = new WfSecurity($this->db);95 $this->instance = &Factory::newInstance('Instance'); 96 $this->process = &Factory::newInstance('Process'); 97 $this->security = &Factory::getInstance('WfSecurity'); 102 98 } 103 99 … … 276 272 return false; 277 273 } 278 $base_activity = new BaseActivity($this->db);274 $base_activity = &Factory::newInstance('BaseActivity'); 279 275 $this->activity =& $base_activity->getActivity($activity_id, $with_roles, $with_agents); 280 276 if (!$this->activity) … … 1091 1087 $workflow = $GLOBALS['workflow']; 1092 1088 unset($_REQUEST['iid']); 1093 $run_activity = CreateObject('workflow.run_activity');1089 $run_activity = Factory::getInstance('run_activity'); 1094 1090 $run_activity->runtime->instance->parentInstanceId = $this->instance_id; 1095 1091 $run_activity->runtime->instance->parentActivityId = $this->activity_id; -
trunk/workflow/inc/engine/src/common/WfSecurity.php
r795 r2591 23 23 * @access public 24 24 */ 25 function WfSecurity( &$db)25 function WfSecurity() 26 26 { 27 27 $this->child_name = 'WfSecurity'; 28 parent::Base($db); 29 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'Instance.php'); 30 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'Process.php'); 31 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'BaseActivity.php'); 28 parent::Base(); 32 29 } 33 30 … … 58 55 ); 59 56 //check theses values for this process and store the result for this object life duration 60 $myProcess = new Process($this->db);57 $myProcess = &Factory::newInstance('Process'); 61 58 $myProcess->getProcess($pId); 62 59 $this->processesConfig[$pId] = $myProcess->getConfigValues($arrayConf); … … 78 75 function checkUserAccess($user, $activity_id, $readonly=false) 79 76 { 77 /* if activity is non-interactive is not necessary checking user access */ 78 $activity = &Factory::getInstance('BaseActivity')->getActivity($activity_id); 79 if (!$activity->isInteractive()) 80 return true; 81 80 82 //group mapping, warning groups and user can have the same id 81 83 if ($user[0] != 'p') … … 577 579 if (!(isset($this->pm))) 578 580 { 579 require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'ProcessManager'.SEP.'ProcessManager.php'); 580 $this->pm = new ProcessManager($this->db); 581 $this->pm = &Factory::newInstance('ProcessManager'); 581 582 } 582 583 //$this->error[] = 'DEBUG: checking to see if there is no view activities on process :'.$pId.':'.$this->pm->get_process_view_activity($pId); -
trunk/workflow/inc/hook_home.inc.php
r795 r2591 1 1 <?php 2 require_once 'common.inc.php'; 3 2 4 $GLOBALS['phpgw_info']['flags']['currentapp'] = "workflow"; 3 5 if (!isset($_SESSION['phpgw_info']['workflow']['server'])) … … 22 24 23 25 $title = lang("External Applications"); 24 $bo = CreateObject('workflow.bo_userinterface');26 $bo = Factory::getInstance('bo_userinterface'); 25 27 $externals = $bo -> externals(); 26 28 $extra_data = ''; … … 42 44 } 43 45 $extra_data .= "</table></div>"; 44 $portalbox = CreateObject('phpgwapi.listbox',46 $portalbox = Factory::getInstance('listbox', 45 47 Array( 46 48 'title' => $title, -
trunk/workflow/inc/hook_sidebox_menu.inc.php
r795 r2591 14 14 */ 15 15 16 require_once 'common.inc.php'; 16 17 require_once 'engine/config.egw.inc.php'; 17 18 18 19 { 19 $workflowACL = CreateObject('workflow.workflow_acl');20 $workflowACL = Factory::getInstance('workflow_acl'); 20 21 $userID = $GLOBALS['phpgw_info']['user']['account_id']; 21 22 $apptitle = $GLOBALS['phpgw_info']['apps'][$appname]['title']; -
trunk/workflow/inc/local/classes/class.JobBase.php
r1437 r2591 89 89 { 90 90 require_once 'common.inc.php'; 91 $GLOBALS['workflow']['factory']->getInstance('WorkflowMacro')->prepareEnvironment();91 Factory::getInstance('WorkflowMacro')->prepareEnvironment(); 92 92 $this->jobID = $jobID; 93 93 $this->processID = $processID; 94 94 $this->currentDate = $currentDate; 95 $this->jobManager = &$GLOBALS['workflow']['factory']->getInstance('WorkflowJobManager');95 $this->jobManager = Factory::getInstance('WorkflowJobManager'); 96 96 $this->testMode = $testMode; 97 97 $this->maximumExecutionTime = $maximumExecutionTime; … … 148 148 final private function prepareEnvironment() 149 149 { 150 $GLOBALS['workflow']['factory']->getInstance('WorkflowMacro')->prepareProcessEnvironment($this->processID); 151 152 require_once PHPGW_SERVER_ROOT . '/workflow/inc/class.process_factory.inc.php'; 150 Factory::getInstance('WorkflowMacro')->prepareProcessEnvironment($this->processID); 153 151 154 152 $this->environment = array(); 155 $this->environment['factory'] = & new ProcessFactory();153 $this->environment['factory'] = &Factory::newInstance('ProcessWrapperFactory'); 156 154 } 157 155 … … 202 200 final public function createNewInstance($startActivityId, $instanceName=false, $properties=false, $user=false) 203 201 { 204 $activityManager = CreateObject('workflow.workflow_activitymanager');202 $activityManager = Factory::getInstance('workflow_activitymanager'); 205 203 $activity = $activityManager->get_activity($startActivityId); 206 204 -
trunk/workflow/inc/local/classes/class.wf_engine.php
r795 r2591 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(); … … 90 90 function continueInstance($activityID, $instanceID) 91 91 { 92 require_once 'class.wf_instance.php'; 93 $WFInstance = new wf_instance(); 92 $WFInstance = &Factory::getInstance('wf_instance'); 94 93 return $WFInstance->continueInstance($activityID, $instanceID); 95 94 } … … 104 103 function abortInstance($instanceID) 105 104 { 106 require_once 'class.wf_instance.php'; 107 $WFInstance = new wf_instance(); 105 $WFInstance = &Factory::getInstance('wf_instance'); 108 106 return $WFInstance->abort($instanceID); 109 107 } … … 119 117 function setInstanceName($instanceID, $name) 120 118 { 121 require_once 'class.wf_instance.php'; 122 $WFInstance = new wf_instance(); 119 $WFInstance = &Factory::getInstance('wf_instance'); 123 120 return $WFInstance->setName($instanceID, $name); 124 121 } … … 134 131 function setInstancePriority($instanceID, $priority) 135 132 { 136 require_once 'class.wf_instance.php'; 137 $WFInstance = new wf_instance(); 133 $WFInstance = &Factory::getInstance('wf_instance'); 138 134 return $WFInstance->setPriority($instanceID, $priority); 139 135 } … … 149 145 function getIdleInstances($numberOfDays, $activities = null) 150 146 { 151 require_once 'class.wf_instance.php'; 152 $WFInstance = new wf_instance(); 147 $WFInstance = &Factory::getInstance('wf_instance'); 153 148 return $WFInstance->getIdle($numberOfDays, $activities); 154 149 } … … 175 170 function getInstancesByName($name) 176 171 { 177 require_once 'class.wf_instance.php'; 178 $WFInstance = new wf_instance(); 172 $WFInstance = &Factory::getInstance('wf_instance'); 179 173 $preOutput = $WFInstance->getByName($name); 180 174 $output = array(); … … 197 191 function getChildInstances($instanceID = null, $activityID = null) 198 192 { 199 require_once 'class.wf_instance.php'; 200 $WFInstance = new wf_instance(); 193 $WFInstance = &Factory::getInstance('wf_instance'); 201 194 $preOutput = $WFInstance->getChildren($instanceID, $activityID); 202 195 $output = array(); … … 217 210 function getInstanceProperties($instanceID) 218 211 { 219 require_once 'class.wf_instance.php'; 220 $WFInstance = new wf_instance(); 212 $WFInstance = &Factory::getInstance('wf_instance'); 221 213 return $WFInstance->getProperties($instanceID); 222 214 } … … 231 223 function getChildInstanceProperties($instanceID) 232 224 { 233 require_once 'class.wf_instance.php'; 234 $WFInstance = new wf_instance(); 225 $WFInstance = &Factory::getInstance('wf_instance'); 235 226 return $WFInstance->getProperties($instanceID); 236 227 } … … 247 238 $flagObject[0] = is_null($this->acl); 248 239 if ($flagObject[0]) 249 $this->acl = CreateObject('workflow.workflow_acl');240 $this->acl = Factory::getInstance('workflow_acl'); 250 241 251 242 $output = $this->acl->getUserPermissions($type, $uid); … … 268 259 $flagObject[0] = is_null($this->acl); 269 260 if ($flagObject[0]) 270 $this->acl = CreateObject('workflow.workflow_acl');261 $this->acl = Factory::getInstance('workflow_acl'); 271 262 272 263 $output = $this->acl->getUserGroupPermissions($type, $uid); … … 291 282 /* build the SQL query */ 292 283 $query = "SELECT wf_activity_id, wf_name, wf_normalized_name, wf_type, wf_description FROM egw_wf_activities WHERE (wf_activity_id = ?) AND (wf_p_id = ?)"; 293 $db = & $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID;284 $db = &Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID; 294 285 $resultSet = $db->query($query, array($activityID, $processID)); 295 286 … … 319 310 /* build the SQL query */ 320 311 $query = "SELECT wf_activity_id, wf_name, wf_normalized_name, wf_type, wf_description FROM egw_wf_activities WHERE (wf_name = ?) AND (wf_p_id = ?)"; 321 $db = & $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID;312 $db = &Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID; 322 313 $resultSet = $db->query($query, array($activityName, $processID)); 323 314 … … 346 337 function getUserInstances($users, $activities = null, $status = null) 347 338 { 348 require_once 'class.wf_instance.php'; 349 $WFInstance = new wf_instance(); 339 $WFInstance = &Factory::getInstance('wf_instance'); 350 340 return $WFInstance->getByUser($users, $activities, $status); 351 341 } … … 360 350 function setInstanceProperty($instanceID, $nameProperty, $value) 361 351 { 362 require_once 'class.wf_instance.php'; 363 $WFInstance = new wf_instance(); 352 $WFInstance = &Factory::getInstance('wf_instance'); 364 353 return $WFInstance->setProperty($instanceID, $nameProperty, $value); 365 354 } … … 377 366 function checkUserAccessToInstance($userID, $instanceID, $activityID, $writeAccess = true) 378 367 { 379 require_once 'class.wf_instance.php'; 380 $WFInstance = new wf_instance(); 368 $WFInstance = &Factory::getInstance('wf_instance'); 381 369 return $WFInstance->checkUserAccess($userID, $instanceID, $activityID, $writeAccess); 382 370 } -
trunk/workflow/inc/local/classes/class.wf_instance.php
r1385 r2591 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; … … 92 92 { 93 93 /* load the DB */ 94 $this->db = & $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID;94 $this->db = &Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID; 95 95 96 96 /* load the process ID from the runtime */ … … 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(); … … 423 423 424 424 /* load the required instance (for the required user) */ 425 require_once GALAXIA_LIBRARY . SEP . 'src' . SEP . 'GUI' . SEP . 'GUI.php'; 426 $GUI = new GUI($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID); 425 $GUI = &Factory::newInstance('GUI'); 427 426 $userInstance = $GUI->gui_list_user_instances($userID, 0, -1, '', '', "(ga.wf_is_interactive = 'y') AND (gia.wf_activity_id = {$activityID}) AND (gia.wf_instance_id = {$instanceID})", false, $this->processID, true, false, true, false, false, false); 428 427 $userInstance = $userInstance['data']; … … 456 455 if ($userID !== '*') 457 456 { 458 require_once dirname(__FILE__) . '/class.wf_role.php'; 459 require_once dirname(__FILE__) . '/class.wf_engine.php'; 460 461 $wfRole = new wf_role(); 462 $engine = new wf_engine(); 457 $wfRole = Factory::getInstance('wf_role'); 458 $engine = Factory::getInstance('wf_engine'); 463 459 /* get information about the activity */ 464 460 if (($activityInfo = $engine->getActivityInformationByID($activityID)) === false) … … 529 525 530 526 /* try to get the role id */ 531 require_once dirname(__FILE__) . '/class.wf_role.php'; 532 $wfRole = new wf_role(); 527 $wfRole = Factory::getInstance('wf_role'); 533 528 if (($roleID = $wfRole->getRoleIdByName($roleName)) === false) 534 529 return false; -
trunk/workflow/inc/local/classes/class.wf_ldap.php
r1067 r2591 1 1 <?php 2 require_once PHPGW_SERVER_ROOT . SEP . 'workflow' . SEP . 'inc' . SEP . 'local' . SEP . 'classes' . SEP . 'class.wf_cached_ldap.php';3 2 4 3 /** … … 41 40 function wf_ldap() 42 41 { 43 $tmpLDAP = &$GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');42 $tmpLDAP = Factory::getInstance('WorkflowLDAP'); 44 43 $this->user_context = $tmpLDAP->getUserContext(); 45 44 $this->group_context = $tmpLDAP->getGroupContext(); 46 45 47 $this->ds = & $GLOBALS['workflow']['workflowObjects']->getLDAP();46 $this->ds = &Factory::getInstance('WorkflowObjects')->getLDAP(); 48 47 49 $this->cachedLDAP = new wf_cached_ldap();48 $this->cachedLDAP = &Factory::getInstance('wf_cached_ldap'); 50 49 $this->cachedLDAP->setOperationMode($this->cachedLDAP->OPERATION_MODE_LDAP); 51 50 } -
trunk/workflow/inc/local/classes/class.wf_location.php
r2137 r2591 36 36 function initialize() 37 37 { 38 $this->db = & $GLOBALS['workflow']['workflowObjects']->getDBExpresso()->Link_ID;38 $this->db = &Factory::getInstance('WorkflowObjects')->getDBExpresso()->Link_ID; 39 39 $this->db->setFetchMode(ADODB_FETCH_ASSOC); 40 40 $this->cityInfo = array(); -
trunk/workflow/inc/local/classes/class.wf_mail.php
r795 r2591 39 39 $requiredConfiguration = array('mail_smtp_profile' => false); 40 40 $configuration = $GLOBALS['workflow']['wf_runtime']->process->getConfigValues($requiredConfiguration); 41 $bo_emailadmin = CreateObject('emailadmin.bo');41 $bo_emailadmin = Factory::getInstance('bo'); 42 42 $profileData = $bo_emailadmin->getProfile($configuration['mail_smtp_profile']); 43 43 -
trunk/workflow/inc/local/classes/class.wf_orgchart.php
r2348 r2591 24 24 function wf_orgchart() 25 25 { 26 $this->db = & $GLOBALS['workflow']['workflowObjects']->getDBWorkflow()->Link_ID;26 $this->db = &Factory::getInstance('WorkflowObjects')->getDBWorkflow()->Link_ID; 27 27 $this->db->setFetchMode(ADODB_FETCH_ASSOC); 28 28 } -
trunk/workflow/inc/local/classes/class.wf_role.php
r1048 r2591 57 57 $this->processID = (int) $GLOBALS['workflow']['job']['processID']; 58 58 59 $this->db = & $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID;60 $this->roleManager = CreateObject('workflow.workflow_rolemanager');61 $this->activityManager = CreateObject('workflow.workflow_activitymanager');59 $this->db = &Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID; 60 $this->roleManager = Factory::getInstance('workflow_rolemanager'); 61 $this->activityManager = Factory::getInstance('workflow_activitymanager'); 62 62 } 63 63 … … 186 186 $users = array((int) $users); 187 187 $roleID = $this->roleManager->get_role_id($this->processID, $roleName); 188 $ldap = &$GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');188 $ldap = Factory::getInstance('WorkflowLDAP'); 189 189 foreach ($users as $user) 190 190 { … … 212 212 $users = $this->roleManager->list_mapped_users($this->processID, false, array('wf_role_name' => $roleName)); 213 213 214 $ldap = &$GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');214 $ldap = Factory::getInstance('WorkflowLDAP'); 215 215 $output = array(); 216 216 foreach ($users as $id => $login) … … 367 367 368 368 /* get the roles */ 369 $userGroups = $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getUserGroups($userID);369 $userGroups = Factory::getInstance('WorkflowLDAP')->getUserGroups($userID); 370 370 $query = 'SELECT DISTINCT role.wf_role_id, role.wf_name, role.wf_description FROM egw_wf_roles role, egw_wf_user_roles user_role WHERE (user_role.wf_role_id = role.wf_role_id) AND (role.wf_p_id = ?) AND (role.wf_role_id = ANY (?))'; 371 371 $query .= ' AND (((user_role.wf_user = ?) AND (user_role.wf_account_type = ?))'; -
trunk/workflow/inc/local/classes/class.wf_workitem.php
r795 r2591 29 29 public function wf_workitem() 30 30 { 31 $this->db = & $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID;31 $this->db = &Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID; 32 32 $this->processID = (int) $GLOBALS['workflow']['wf_runtime']->activity->getProcessId(); 33 33 } -
trunk/workflow/inc/natural/class.natural.php
r795 r2591 196 196 try 197 197 { 198 $str = new PosString(new NatType);198 $str = Factory::newInstance('PosString', Factory::newInstance('NatType')); 199 199 $this->strInputParameter = $str->mountString(array_merge($this->obj->input, $this->obj->output), $inputParams); 200 200 … … 409 409 if (!empty($this->resultSet)) 410 410 unset($this->resultSet); 411 $this->resultSet = new NaturalResultSet($result);411 $this->resultSet = &Factory::newInstance('NaturalResultSet', $result); 412 412 } 413 413 } -
trunk/workflow/inc/smarty/wf_plugins/function.wf_generic_select.php
r795 r2591 53 53 EOF; 54 54 55 $templateServer = & $GLOBALS['workflow']['factory']->getInstance('TemplateServer');55 $templateServer = &Factory::getInstance('TemplateServer'); 56 56 $imageAdd = $templateServer->generateImageLink('add.png'); 57 57 $imageRemove = $templateServer->generateImageLink('close.png'); -
trunk/workflow/inc/smarty/wf_plugins/function.wf_redir_menu.php
r795 r2591 53 53 $select_tag .= "<option value=\"og\">Organograma</option>"; 54 54 55 $user_is_admin = $GLOBALS['workflow']['factory']->getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']);55 $user_is_admin = Factory::getInstance('workflow_acl')->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']); 56 56 if ($user_is_admin || ($GLOBALS['phpgw']->acl->check('admin_workflow',1,'workflow'))) { 57 57 $select_tag .= "<option value=\"ad\">Administração</option>"; -
trunk/workflow/inc/smarty/wf_plugins/function.wf_select_city.php
r795 r2591 37 37 if (!array_key_exists($required, $params) || (empty($params[$required]))) 38 38 $smarty->trigger_error("[wf_select_city] missing required parameter(s): $required", E_USER_ERROR); 39 39 40 40 /* atribui valores default para os parâmetros não passados */ 41 41 foreach ($defaultValues as $key => $value) 42 42 if (!isset($params[$key])) 43 43 $params[$key] = $value; 44 44 45 45 /* extrai alguns parâmetros da matriz de parâmetros */ 46 46 foreach ($extractParams as $extract) 47 47 $$extract = $params[$extract]; 48 48 49 49 /* parâmetros extras são "acumulados" em uma única variável */ 50 50 $extraParams = array(); … … 53 53 $extraParams[$key] = $value_params; 54 54 55 $db = & $GLOBALS['workflow']['workflowObjects']->getDBExpresso()->Link_ID;55 $db = &Factory::getInstance('WorkflowObjects')->getDBExpresso()->Link_ID; 56 56 if (isset($params['value'])) 57 57 { -
trunk/workflow/inc/smarty/wf_plugins/function.wf_select_ldap_users.php
r795 r2591 25 25 { 26 26 require_once $smarty->_get_plugin_filepath('function','html_options'); 27 $imagesPath = substr( $GLOBALS['workflow']['factory']->getInstance('TemplateServer')->generateImageLink(''), 0, -1);27 $imagesPath = substr(Factory::getInstance('TemplateServer')->generateImageLink(''), 0, -1); 28 28 29 29 $requiredParams = array( -
trunk/workflow/inc/smarty/wf_plugins/function.wf_select_state.php
r795 r2591 46 46 $sql = "SELECT id_state, state_name FROM phpgw_cc_state WHERE id_country = 'BR' ORDER BY state_name"; 47 47 48 $result = $GLOBALS['workflow']['workflowObjects']->getDBExpresso()->Link_ID->query($sql);48 $result = Factory::getInstance('WorkflowObjects')->getDBExpresso()->Link_ID->query($sql); 49 49 $estados = array(); 50 50 while ($row = $result->fetchRow(DB_FETCHMODE_ASSOC)) -
trunk/workflow/inc/smarty/wf_plugins/function.wf_select_user.php
r795 r2591 94 94 $extraParams .= "&hideSectors=1"; 95 95 96 $image = $GLOBALS['workflow']['factory']->getInstance('TemplateServer')->generateImageLink('add_user.png');96 $image = Factory::getInstance('TemplateServer')->generateImageLink('add_user.png'); 97 97 98 98 $output .= <<<EOF -
trunk/workflow/inc/smarty/wf_plugins/function.wf_select_users.php
r795 r2591 16 16 { 17 17 require_once $smarty->_get_plugin_filepath('function','html_options'); 18 $imagesPath = substr( $GLOBALS['workflow']['factory']->getInstance('TemplateServer')->generateImageLink(''), 0, -1);18 $imagesPath = substr(Factory::getInstance('TemplateServer')->generateImageLink(''), 0, -1); 19 19 $requiredParams = array( 20 20 'name'); -
trunk/workflow/inc/smarty/wf_plugins/prefilter.wf_default_template.php
r795 r2591 31 31 { 32 32 /* get the header and footer location */ 33 $templateServer = & $GLOBALS['workflow']['factory']->getInstance('TemplateServer');33 $templateServer = &Factory::getInstance('TemplateServer'); 34 34 $header = $templateServer->getSystemFile('processes/header.tpl'); 35 35 $footer = $templateServer->getSystemFile('processes/footer.tpl'); -
trunk/workflow/index.php
r2589 r2591 24 24 require_once dirname(__FILE__) . '/inc/nano/JSON.php'; 25 25 require_once dirname(__FILE__) . '/inc/nano/NanoJsonConverter.class.php'; 26 require_once dirname(__FILE__) . '/inc/nano/NanoController.class.php'; 27 $nanoController = new NanoController(); 26 $nanoController = &Factory::newInstance('NanoController'); 28 27 $nanoController->throwErrorOnAllVirtualRequests('__NANOAJAX_SESSION_EXPIRED__'); 29 28 exit; -
trunk/workflow/redirect.php
r1468 r2591 12 12 if (empty($_SESSION)) 13 13 exit(0); 14 $GLOBALS['workflow']['factory']->getInstance('ResourcesRedirector')->redirect();14 Factory::getInstance('ResourcesRedirector')->redirect(); 15 15 ?> -
trunk/workflow/showUserPicture.php
r1468 r2591 12 12 if (empty($_SESSION)) 13 13 exit(0); 14 $GLOBALS['workflow']['factory']->getInstance('UserPictureProvider')->serve();14 Factory::getInstance('UserPictureProvider')->serve(); 15 15 ?> -
trunk/workflow/templateFile.php
r1468 r2591 12 12 if (empty($_SESSION)) 13 13 exit(0); 14 $GLOBALS['workflow']['factory']->getInstance('TemplateServer')->redirect();14 Factory::getInstance('TemplateServer')->redirect(); 15 15 ?>
Note: See TracChangeset
for help on using the changeset viewer.