From fd9d1b1ceb76c39c4c50dd11d4614677dc6f99ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Leroy?= <regis_leroy@alumni.egroupware.org>
Date: Wed, 11 May 2005 14:23:23 +0000
Subject: [PATCH] galaxia workflow bugfix: non interactive activities should
 not set the user to the actual user, the user having the role on this
 activity (to make a manual send for example) can be a different one as this
 actual user is the one having a role on the prev interactive activity

---
 phpgwapi/inc/galaxia_workflow/compiler/activity_pre.php | 2 +-
 phpgwapi/inc/galaxia_workflow/compiler/end_pre.php      | 2 +-
 phpgwapi/inc/galaxia_workflow/compiler/join_pre.php     | 2 +-
 phpgwapi/inc/galaxia_workflow/compiler/split_pre.php    | 2 +-
 phpgwapi/inc/galaxia_workflow/compiler/switch_pre.php   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/phpgwapi/inc/galaxia_workflow/compiler/activity_pre.php b/phpgwapi/inc/galaxia_workflow/compiler/activity_pre.php
index f38dabe2ec..7e6a83c6aa 100644
--- a/phpgwapi/inc/galaxia_workflow/compiler/activity_pre.php
+++ b/phpgwapi/inc/galaxia_workflow/compiler/activity_pre.php
@@ -13,7 +13,7 @@ if(empty($instance->instanceId)) {
   }
 }
 // Set the current user for this activity
-if(isset($GLOBALS['user']) && !empty($instance->instanceId) && !empty($activity_id)) {
+if(isset($GLOBALS['user']) && ($activity->isInteractive()) && !empty($instance->instanceId) && !empty($activity_id)) {
   $instance->setActivityUser($activity_id,$GLOBALS['user']);
 }
 
diff --git a/phpgwapi/inc/galaxia_workflow/compiler/end_pre.php b/phpgwapi/inc/galaxia_workflow/compiler/end_pre.php
index 7d5b5fd5e4..9ec034a4dc 100644
--- a/phpgwapi/inc/galaxia_workflow/compiler/end_pre.php
+++ b/phpgwapi/inc/galaxia_workflow/compiler/end_pre.php
@@ -13,7 +13,7 @@ if(empty($instance->instanceId)) {
   }
 }
 // Set the current user for this activity
-if(isset($GLOBALS['user']) && !empty($instance->instanceId) && !empty($activity_id)) {
+if(isset($GLOBALS['user']) && ($activity->isInteractive()) && !empty($instance->instanceId) && !empty($activity_id)) {
   $instance->setActivityUser($activity_id,$GLOBALS['user']);
 }
 
diff --git a/phpgwapi/inc/galaxia_workflow/compiler/join_pre.php b/phpgwapi/inc/galaxia_workflow/compiler/join_pre.php
index 94ee4f4b4c..689a62cc23 100644
--- a/phpgwapi/inc/galaxia_workflow/compiler/join_pre.php
+++ b/phpgwapi/inc/galaxia_workflow/compiler/join_pre.php
@@ -13,7 +13,7 @@ if(empty($instance->instanceId)) {
   }
 }
 // Set the current user for this activity
-if(isset($GLOBALS['user']) && !empty($instance->instanceId) && !empty($activity_id)) {
+if(isset($GLOBALS['user']) && ($activity->isInteractive()) && !empty($instance->instanceId) && !empty($activity_id)) {
   $instance->setActivityUser($activity_id,$GLOBALS['user']);
 }
 
diff --git a/phpgwapi/inc/galaxia_workflow/compiler/split_pre.php b/phpgwapi/inc/galaxia_workflow/compiler/split_pre.php
index 4cf70715dd..30d91eee94 100644
--- a/phpgwapi/inc/galaxia_workflow/compiler/split_pre.php
+++ b/phpgwapi/inc/galaxia_workflow/compiler/split_pre.php
@@ -13,7 +13,7 @@ if(empty($instance->instanceId)) {
   }
 }
 // Set the current user for this activity
-if(isset($GLOBALS['user']) && !empty($instance->instanceId) && !empty($activity_id)) {
+if(isset($GLOBALS['user']) && ($activity->isInteractive()) && !empty($instance->instanceId) && !empty($activity_id)) {
   $instance->setActivityUser($activity_id,$GLOBALS['user']);
 }
 
diff --git a/phpgwapi/inc/galaxia_workflow/compiler/switch_pre.php b/phpgwapi/inc/galaxia_workflow/compiler/switch_pre.php
index 436a40e2cf..c94f01c3ca 100644
--- a/phpgwapi/inc/galaxia_workflow/compiler/switch_pre.php
+++ b/phpgwapi/inc/galaxia_workflow/compiler/switch_pre.php
@@ -13,7 +13,7 @@ if(empty($instance->instanceId)) {
   }
 }
 // Set the current user for this activity
-if(isset($GLOBALS['user']) && !empty($instance->instanceId) && !empty($activity_id)) {
+if(isset($GLOBALS['user']) && ($activity->isInteractive()) && !empty($instance->instanceId) && !empty($activity_id)) {
   $instance->setActivityUser($activity_id,$GLOBALS['user']);
 }