From e86ee77d5ce08768a1113a917b9563c82e780cbb Mon Sep 17 00:00:00 2001
From: Nate <github@najo.com>
Date: Mon, 13 Apr 2020 13:57:31 -0600
Subject: [PATCH] Users - Edit: Fix assigned and available Groups when
 cross-domain editing (via Show All feature).

---
 core/users/user_edit.php | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/core/users/user_edit.php b/core/users/user_edit.php
index 52204e21c1..8a2d3a27cd 100644
--- a/core/users/user_edit.php
+++ b/core/users/user_edit.php
@@ -508,7 +508,7 @@
 			$p->add("user_setting_edit", "temp");
 			$p->add("user_edit", "temp");
 			$p->add('user_group_add', 'temp');
-	
+
 		//save the data
 			$database = new database;
 			$database->app_name = 'users';
@@ -555,14 +555,7 @@
 			else {
 				message::add($text['message-add'],'positive');
 			}
-			if ($domain_uuid == $_SESSION['domain_uuid']) {
-				//same domain, edit user
-				header("Location: user_edit.php?id=".urldecode($user_uuid));
-			}
-			else {
-				//different domain, return to list
-				header('Location: users.php');
-			}
+			header("Location: user_edit.php?id=".urlencode($user_uuid));
 			exit;
 	}
 
@@ -928,7 +921,7 @@
 		$sql .= "order by ";
 		$sql .= "	g.domain_uuid desc, ";
 		$sql .= "	g.group_name asc ";
-		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['user_uuid'] = $user_uuid;
 		$database = new database;
 		$user_groups = $database->select($sql, $parameters, 'all');
@@ -961,7 +954,7 @@
 			$sql .= "and group_uuid not in ('".implode("','",$assigned_groups)."') ";
 		}
 		$sql .= "order by domain_uuid desc, group_name asc ";
-		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$parameters['domain_uuid'] = $domain_uuid;
 		$database = new database;
 		$groups = $database->select($sql, $parameters, 'all');
 		if (is_array($groups)) {
@@ -1086,4 +1079,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
+?>
\ No newline at end of file