From 7b5412ff3692b36c18e14a79ee4279a9064e92ce Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Jul 2017 14:21:24 +0200
Subject: [PATCH] remove from process only if status[receipt], status[revision]
 is not set

---
 SeedDMS_Core/Core/inc.ClassUser.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 185625515..5ee1bc840 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -767,7 +767,6 @@ class SeedDMS_Core_User { /* {{{ */
 			if($ri['status'] != -2 && (!isset($states['review']) || in_array($ri['status'], $states['review']))) {
 				$queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ".
 					"VALUES ('". $ri["reviewID"] ."', '-2', 'Reviewer removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
-				echo $queryStr;
 				$res=$db->getResult($queryStr);
 				if(!$res) {
 					return false;
@@ -780,7 +779,6 @@ class SeedDMS_Core_User { /* {{{ */
 			if($ai['status'] != -2 && (!isset($states['approval']) || in_array($ai['status'], $states['approval']))) {
 				$queryStr = "INSERT INTO `tblDocumentApproveLog` (`approveID`, `status`, `comment`, `date`, `userID`) ".
 					"VALUES ('". $ai["approveID"] ."', '-2', 'Approver removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
-				echo $queryStr;
 				$res=$db->getResult($queryStr);
 				if(!$res) {
 					return false;
@@ -790,7 +788,7 @@ class SeedDMS_Core_User { /* {{{ */
 
 		$receiptStatus = $this->getReceiptStatus();
 		foreach ($receiptStatus["indstatus"] as $ri) {
-			if($ri['status'] != -2 && (empty($states['receipt']) || in_array($ri['status'], $states['receipt']))) {
+			if($ri['status'] != -2 && (!isset($states['receipt']) || in_array($ri['status'], $states['receipt']))) {
 				$queryStr = "INSERT INTO `tblDocumentReceiptLog` (`receiptID`, `status`, `comment`, `date`, `userID`) ".
 					"VALUES ('". $ri["receiptID"] ."', '-2', 'Recipient removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
 				$res=$db->getResult($queryStr);
@@ -802,7 +800,7 @@ class SeedDMS_Core_User { /* {{{ */
 
 		$revisionStatus = $this->getRevisionStatus();
 		foreach ($revisionStatus["indstatus"] as $ri) {
-			if($ri['status'] != -2 && (empty($states['revision']) || in_array($ri['status'], $states['revision']))) {
+			if($ri['status'] != -2 && (!isset($states['revision']) || in_array($ri['status'], $states['revision']))) {
 				$queryStr = "INSERT INTO `tblDocumentRevisionLog` (`revisionID`, `status`, `comment`, `date`, `userID`) ".
 					"VALUES ('". $ri["revisionID"] ."', '-2', 'Revisor removed from process', ".$db->getCurrentDatetime().", '". $user->getID() ."')";
 				$res=$db->getResult($queryStr);