Changeset 2372 for sandbox/workflow/trunk/inc/engine/src/ProcessManager/RoleManager.php

Timestamp:

03/29/10 14:46:01 (14 years ago)

Author:

pedroerp

Message:

Ticket #609 - Merged 2197:2356 /sandbox/workflow/branches/609/ em /sandbox/workflow/trunk.

File:

• sandbox/workflow/trunk/inc/engine/src/ProcessManager/RoleManager.php (modified) (3 diffs)

sandbox/workflow/trunk/inc/engine/src/ProcessManager/RoleManager.php

@@ -19 +19 @@
    * @access public
    */
-  function RoleManager(&$db) 
-  {
-    parent::Base($db);
+  function RoleManager() 
+  {
+    parent::Base();
     $this->child_name = 'RoleManager';
   }
@@ -247 +247 @@
     $result = $this->query($query,$bindvars);
     $ret = Array();
-    $ldap = &$GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP');
+    $ldap = &Factory::getInstance('WorkflowLDAP');
     if (!(empty($result)))
     {
@@ -256 +256 @@
           //we have a group instead of a simple user and we want real users
           $real_users = galaxia_retrieve_group_users($res['wf_user'], true);
-          foreach ($real_users as $key => $value)
-          {
-            $ret[$key]=$value;
-          }
+                  if (!empty($real_users)) {
+            foreach ($real_users as $key => $value)
+            {
+              $ret[$key]=$value;
+            }
+                  }
         }
         else