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

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

@@ -50 +50 @@
         function WorkflowLDAP()
         {
-                $this->dataSource = &$GLOBALS['workflow']['workflowObjects']->getLDAP();
+                $this->dataSource =& Factory::getInstance('WorkflowObjects')->getLDAP();
 
                 /* get the required parameters */
@@ -377 +377 @@
          * @access public
          */
-        function getUsers($context)
-        {
-                $filter = '(&(phpgwaccounttype=u)(!(phpgwAccountVisible=-1)))';
+        function getUsers($context, $onlyVisibleAccounts = true)
+        {
+                $filter = '(phpgwaccounttype=u)';
+                if($onlyVisibleAccounts)
+                        $filter = '(&' . $filter . '(!(phpgwAccountVisible=-1)))';
+
                 $elements = array('uidnumber', 'cn', 'mail');
                 return $this->getEntities($context, $filter, $elements, 'u', false);
@@ -561 +564 @@
          * @access public
          */
-        function search($searchTerm, $includeUsers = true, $includeGroups = false, $includeLists = false, $context = null)
+        function search($searchTerm, $includeUsers = true, $includeGroups = false, $includeLists = false, $context = null, $onlyVisibleAccounts = true)
         {
                 if (!($includeUsers || $includeGroups || $includeLists))
@@ -586 +589 @@
                         $entityFilter = $entityFilter[0];
 
-                $filter = "(&{$entityFilter}(cn={$searchTerm})(!(phpgwAccountVisible=-1)))";
+                if($onlyVisibleAccounts)
+                        $filter = "(&{$entityFilter}(cn={$searchTerm})(!(phpgwAccountVisible=-1)))";
+                else
+                        $filter = "(&{$entityFilter}(cn={$searchTerm}))";
+
                 $resourceIdentifier = ldap_search($this->dataSource, $context, $filter, array('cn', 'uidnumber', 'gidnumber', 'phpgwaccounttype', 'mail'));
                 ldap_sort($this->dataSource, $resourceIdentifier, 'cn');