Changeset 2492 for sandbox/workflow/branches/993/inc/class.WorkflowLDAP.inc.php

Timestamp:

04/12/10 16:21:32 (14 years ago)

Author:

pedroerp

Message:

Ticket #993 - Trocando acessos à GLOBALS por acessos à Settings.

File:

• sandbox/workflow/branches/993/inc/class.WorkflowLDAP.inc.php (modified) (1 diff)

sandbox/workflow/branches/993/inc/class.WorkflowLDAP.inc.php

@@ -53 +53 @@
 
                 /* get the required parameters */
-                $info = (isset($GLOBALS['phpgw_info']['server']['ldap_context'])) ?
-                        $GLOBALS['phpgw_info']['server'] :
-                        $_SESSION['phpgw_info']['workflow']['server'];
-                $ldapConfigValues = galaxia_get_config_values(array('ldap_user_context' => '', 'ldap_group_context' => ''));
-                if (empty($ldapConfigValues['ldap_user_context']))
-                        $ldapConfigValues['ldap_user_context'] = $info['ldap_context'];
-                if (empty($ldapConfigValues['ldap_group_context']))
-                        $ldapConfigValues['ldap_group_context'] = $info['ldap_group_context'];
-                $this->userContext = $ldapConfigValues['ldap_user_context'];
-                $this->groupContext = $ldapConfigValues['ldap_group_context'];
-                $this->ldapContext = $ldapConfigValues['ldap_user_context'];
+                $ldapUserContext = Settings::get('workflow', 'ldap', 'user_context');
+                $ldapGroupContext = Settings::get('workflow', 'ldap', 'group_context');
+
+                if (empty($ldapUserContext))
+                        $ldapUserContext = Settings::get('expresso', 'ldap', 'user_context');
+
+                if (empty($ldapGroupContext))
+                        $ldapGroupContext = Settings::get('expresso', 'ldap', 'group_context');
+
+                $this->userContext = $ldapUserContext;
+                $this->groupContext = $ldapGroupContext;
+                $this->ldapContext = $ldapUserContext;
 
                 $this->cache = array(