From c32bff5074ebde9ad8c36b635b3c3e17d57d8216 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 31 Jul 2017 13:21:01 +0200
Subject: [PATCH] separate removal of reviews and approval

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

diff --git a/SeedDMS_Core/Core/inc.ClassUser.php b/SeedDMS_Core/Core/inc.ClassUser.php
index 8e56fd4fa..8e463986a 100644
--- a/SeedDMS_Core/Core/inc.ClassUser.php
+++ b/SeedDMS_Core/Core/inc.ClassUser.php
@@ -496,9 +496,10 @@ class SeedDMS_Core_User { /* {{{ */
 
 		$reviewStatus = $this->getReviewStatus();
 		foreach ($reviewStatus["indstatus"] as $ri) {
-			if($ri['status'] != -2 && (!$states || in_array($ri['status'], $states))) {
+			if($ri['status'] != -2 && (empty($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;
@@ -508,9 +509,10 @@ class SeedDMS_Core_User { /* {{{ */
 
 		$approvalStatus = $this->getApprovalStatus();
 		foreach ($approvalStatus["indstatus"] as $ai) {
-			if($ai['status'] != -2 && (!$states || in_array($ai['status'], $states))) {
+			if($ai['status'] != -2 && (empty($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;