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

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

@@ -42 +42 @@
                 parent::WorkflowUtils();
 
-                $this->workflow_acl = CreateObject('workflow.workflow_acl');
+                $this->workflow_acl = Factory::getInstance('workflow_acl');
                 $denyAccess = true;
                 if ($this->workflow_acl->checkWorkflowAdmin($GLOBALS['phpgw_info']['user']['account_id']))
@@ -71 +71 @@
                 }
 
-                $this->process_manager  = CreateObject('workflow.workflow_processmanager');
-                $this->activity_manager = CreateObject('workflow.workflow_activitymanager');
-                $this->role_manager     = CreateObject('workflow.workflow_rolemanager');
+                $this->process_manager  = Factory::getInstance('workflow_processmanager');
+                $this->activity_manager = Factory::getInstance('workflow_activitymanager');
+                $this->role_manager     = Factory::getInstance('workflow_rolemanager');
                 $this->form_action = $GLOBALS['phpgw']->link('/index.php', 'menuaction=workflow.ui_adminroles.form');
                 
@@ -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>');
                 }
-                else {  
+                else {
                         /* load the LDAP information */
-                        $cachedLDAP = $GLOBALS['workflow']['factory']->getInstance('CachedLDAP');
-                        $tmpLDAP = &$GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');
+                        $cachedLDAP = Factory::getInstance('CachedLDAP');
+                        $tmpLDAP = &Factory::getInstance('WorkflowLDAP');
                         $userContext  = $tmpLDAP->getUserContext();
                         $groupContext = $tmpLDAP->getGroupContext();
@@ -264 +264 @@
                         {
                                 if ($mapping['wf_account_type'] == 'g') {
-                                        $sri = ldap_search($GLOBALS['workflow']['workflowObjects']->getLDAP(), 
-                                                                        $groupContext, 
+                                        $sri = ldap_search(Factory::getInstance('WorkflowObjects')->getLDAP(),
+                                                                        $groupContext,
                                                                         '(&(gidnumber=' . (int)$mapping['wf_user'] . ')(phpgwAccountType=g))');
-                                                                        
-                                        $allValues = ldap_get_entries($GLOBALS['workflow']['workflowObjects']->getLDAP(), $sri);
-                                        
+
+                                        $allValues = ldap_get_entries(Factory::getInstance('WorkflowObjects')->getLDAP(), $sri);
+
                                         $cname = $GLOBALS['phpgw']->translation->convert($allValues[0]['cn'][0],'utf-8');
                                         $glabel = '[' . lang('Group') . ']';
@@ -276 +276 @@
                                         $entry = $cachedLDAP->getEntryByID($mapping['wf_user']);
                                         $cname = $GLOBALS['phpgw']->translation->convert($entry['cn'],'utf-8');
-                                        $glabel = "";
+                                        $glabel = (!empty($entry['uid'])) ? '[' . $entry['uid'] . ']' : '';
                                         if (is_null($entry['last_update']))
-                                                $glabel = '<font color="red">(excluído)</font>';
+                                                $glabel = '<font color="red">(inativo)</font>';
                                 }
-                                
+
                                 $this->t->set_var(array(
                                         'map_user_id'   => $mapping['wf_user'],
@@ -313 +313 @@
          * Show users roles selects
          * @param string $all_roles_data
-         * @return 
+         * @return
          */
         function show_users_roles_selects($all_roles_data)
         {
-                $templateServer = &$GLOBALS['workflow']['factory']->getInstance('TemplateServer');
+                $templateServer = &Factory::getInstance('TemplateServer');
                 $imgaddusers = $templateServer->generateImageLink('add_group.png');
                 $imgdelusers = $templateServer->generateImageLink('delete_group.png');
@@ -325 +325 @@
                         'src_img_del_users' => $imgdelusers
                 ));
-                
+
                 $this->t->set_block('admin_roles', 'block_select_roles', 'select_roles');
                 foreach ($all_roles_data as $role)