Changeset 2372 for sandbox/workflow/trunk/inc/engine/src/common/WfSecurity.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/common/WfSecurity.php (modified) (4 diffs)

sandbox/workflow/trunk/inc/engine/src/common/WfSecurity.php

@@ -23 +23 @@
    * @access public
    */
-  function WfSecurity(&$db) 
+  function WfSecurity() 
   {
     $this->child_name = 'WfSecurity';
-    parent::Base($db);
-    require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'Instance.php');
-    require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'Process.php');
-    require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'API'.SEP.'BaseActivity.php');
+    parent::Base();
   }
 
@@ -58 +55 @@
       );
       //check theses values for this process and store the result for this object life duration
-      $myProcess = new Process($this->db);
+      $myProcess = &Factory::newInstance('Process');
       $myProcess->getProcess($pId);
       $this->processesConfig[$pId] = $myProcess->getConfigValues($arrayConf);
@@ -78 +75 @@
   function checkUserAccess($user, $activity_id, $readonly=false) 
   {
+        /* if activity is non-interactive is not necessary checking user access */
+        $activity = &Factory::getInstance('BaseActivity')->getActivity($activity_id);
+        if (!$activity->isInteractive())
+                return true;
+
     //group mapping, warning groups and user can have the same id
     if ($user[0] != 'p')
@@ -577 +579 @@
       if (!(isset($this->pm)))
       {
-        require_once(GALAXIA_LIBRARY.SEP.'src'.SEP.'ProcessManager'.SEP.'ProcessManager.php');
-        $this->pm = new ProcessManager($this->db);
+        $this->pm = &Factory::newInstance('ProcessManager');
       }
       //$this->error[] = 'DEBUG: checking to see if there is no view activities on process :'.$pId.':'.$this->pm->get_process_view_activity($pId);