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

branches/2.2/workflow/inc/local/classes/class.wf_ldap.php

@@ -1 +1 @@
 <?php
-require_once PHPGW_SERVER_ROOT . SEP . 'workflow' . SEP . 'inc' . SEP . 'local' . SEP . 'classes' . SEP . 'class.wf_cached_ldap.php';
 
 /**
@@ -41 +40 @@
         function wf_ldap()
         {
-                $tmpLDAP = &$GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');
+                $tmpLDAP = Factory::getInstance('WorkflowLDAP');
                 $this->user_context  = $tmpLDAP->getUserContext();
                 $this->group_context = $tmpLDAP->getGroupContext();
 
-                $this->ds = &$GLOBALS['workflow']['workflowObjects']->getLDAP();
+                $this->ds = &Factory::getInstance('WorkflowObjects')->getLDAP();
 
-                $this->cachedLDAP = new wf_cached_ldap();
+                $this->cachedLDAP = &Factory::getInstance('wf_cached_ldap');
                 $this->cachedLDAP->setOperationMode($this->cachedLDAP->OPERATION_MODE_LDAP);
         }