From 2aa67b93a06d74b0d3dc382f5b4a3d4f61daee16 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 9 May 2022 09:55:48 +0200 Subject: [PATCH] handle case when certain docs are passed to removefromprocesses --- op/op.UsrMgr.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php index d694793a0..013c92ccd 100644 --- a/op/op.UsrMgr.php +++ b/op/op.UsrMgr.php @@ -228,13 +228,15 @@ else if ($action == "removefromprocesses") { $_POST["status"]["review"] = array(); if(!isset($_POST["status"]["approval"])) $_POST["status"]["approval"] = array(); - if (!$userToRemove->removeFromProcesses($user, $_POST['status'])) { - UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); + if(!empty($_POST['needsdocs']) && empty($_POST['docs'])) { + $session->setSplashMsg(array('type'=>'error', 'msg'=>getMLText('error_rm_user_processes_no_docs'))); + } else { + if (!$userToRemove->removeFromProcesses($user, $_POST['status'], $userToAssign, $_POST['docs'])) { + UI::exitError(getMLText("admin_tools"),getMLText("error_rm_user_processes")); + } + add_log_line(".php&action=removefromprocesses&userid=".$userid); + $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_rm_user_processes'))); } - - add_log_line(".php&action=removefromprocesses&userid=".$userid); - - $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_rm_user_processes'))); } }