Changeset 3167 for branches/2.2/workflow/inc/class.bo_adminaccess.inc.php

Timestamp:

08/17/10 16:17:12 (14 years ago)

Author:

viani

Message:

Ticket #1135 - Merged r1990:3166 from /trunk/workflow into /branches/2.2/workflow

File:

• branches/2.2/workflow/inc/class.bo_adminaccess.inc.php (modified) (6 diffs)

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

@@ -11 +11 @@
 
 require_once('class.bo_ajaxinterface.inc.php');
-require_once('class.so_adminaccess.inc.php');
-require_once(GALAXIA_LIBRARY . SEP . 'src' . SEP . 'ProcessManager' . SEP . 'ProcessManager.php');
 require_once(PHPGW_API_INC . SEP . 'common_functions.inc.php');
-require_once(PHPGW_API_INC . SEP . 'class.acl.inc.php');
 
 /**
@@ -43 +40 @@
                 parent::bo_ajaxinterface();
 
-                if (!$GLOBALS['workflow']['factory']->getInstance('workflow_acl')->checkWorkflowAdmin($_SESSION['phpgw_info']['workflow']['account_id']))
+                if (!Factory::getInstance('workflow_acl')->checkWorkflowAdmin($_SESSION['phpgw_info']['workflow']['account_id']))
                         exit(serialize(array('error' => 'Você não tem permissão para executar esta operação.')));
 
-                $this->so = new so_adminaccess($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);
+                $this->so = &Factory::getInstance('so_adminaccess', Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID);
         }
 
@@ -57 +54 @@
         function get_all_processes()
         {
-                $proc_mng = new ProcessManager($GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID);
+                $proc_mng = &Factory::newInstance('ProcessManager');
                 $proc_list = $proc_mng->list_processes(0,-1,'wf_name__ASC');
 
@@ -315 +312 @@
         {
                 $GLOBALS['phpgw']->db = $GLOBALS['ajax']->db;
-                $acl = new ACL();
+                $acl = &Factory::getInstance('acl');
                 $output = $this->so->getUserNames($acl->get_ids_for_location('admin_workflow', 1, 'workflow'));
                 unset($GLOBALS['phpgw']->db);
@@ -332 +329 @@
                 $ids = explode('.', str_replace('g', '', str_replace('u', '', $params['user_ids'])));
                 $GLOBALS['phpgw']->db = $GLOBALS['ajax']->db;
-                $acl = new ACL();
+                $acl = &Factory::getInstance('acl');
                 foreach ($ids as $id)
                         $acl->add_repository('workflow', 'admin_workflow', $id, 1);
@@ -350 +347 @@
         {
                 $GLOBALS['phpgw']->db = $GLOBALS['ajax']->db;
-                $acl = new ACL();
+                $acl = &Factory::getInstance('acl');
                 $acl->delete_repository('workflow', 'admin_workflow', (int) $params['admin_id']);
                 unset($GLOBALS['phpgw']->db);