Merge branch 'U4-8189' of https://github.com/danlister/Umbraco-CMS into danlister-U4-8189

Conflicts:
	src/Umbraco.Core/Constants-Applications.cs
	src/Umbraco.Web/Umbraco.Web.csproj

src/Umbraco.Web/Trees/UsersTreeController.cs

@@ -0,0 +1,103 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Net.Http.Formatting;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Web.WebApi.Filters;
+using Umbraco.Web._Legacy.Actions;
+using Umbraco.Core.Services;
+using Umbraco.Web.Models.Trees;
+using Umbraco.Web.Mvc;
+using Constants = Umbraco.Core.Constants;
+
+namespace Umbraco.Web.Trees
+{
+    [UmbracoTreeAuthorize(Constants.Trees.Users)]
+    [Tree(Constants.Applications.Users, Constants.Trees.Users, null)]
+    [PluginController("UmbracoTrees")]
+    [CoreTree]
+    public class UsersTreeController : TreeController
+    {
+        protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
+        {
+            var nodes = new TreeNodeCollection();
+
+            int totalusers;
+            var users = new List<IUser>(Services.UserService.GetAll(0, int.MaxValue, out totalusers));
+
+            var currentUser = UmbracoContext.Current.Security.CurrentUser;
+            var currentUserIsAdmin = currentUser.IsAdmin();
+
+            foreach (var user in users.OrderBy(x => x.IsApproved == false))
+            {
+                if (UmbracoConfig.For.UmbracoSettings().Security.HideDisabledUsersInBackoffice &&
+                    (UmbracoConfig.For.UmbracoSettings().Security.HideDisabledUsersInBackoffice == false ||
+                     user.IsApproved == false))
+                {
+                    continue;
+                }
+
+                var node = CreateTreeNode(
+                    user.Id.ToString(CultureInfo.InvariantCulture),
+                    "-1",
+                    queryStrings,
+                    user.Name,
+                    "icon-user",
+                    false,
+                    "/" + queryStrings.GetValue<string>("application") + "/framed/"
+                    + Uri.EscapeDataString("users/EditUser.aspx?id=" + user.Id));
+
+                if (user.Id == 0)
+                {
+                    if (currentUser.Id != 0)
+                        continue;
+                }
+                else if (currentUserIsAdmin == false && user.IsAdmin())
+                    continue;
+
+                if (user.IsApproved == false)
+                    node.CssClasses.Add("not-published");
+
+                nodes.Add(node);
+            }
+
+            return nodes;
+        }
+
+        protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings)
+        {
+            var menu = new MenuItemCollection();
+
+            if (id == Constants.System.Root.ToInvariantString())
+            {
+                // Root actions              
+                menu.Items.Add<ActionNew>(Services.TextService.Localize("actions", ActionNew.Instance.Alias))
+                    .ConvertLegacyMenuItem(null, "users", queryStrings.GetValue<string>("application"));
+
+                menu.Items.Add<RefreshNode, ActionRefresh>(
+                    Services.TextService.Localize("actions", ActionRefresh.Instance.Alias), true);
+                return menu;
+            }
+
+            // If administator, don't create a menu
+            if (id == "0")
+                return menu;
+
+            // Disable user
+            menu.Items.Add<ActionDisable>(
+                Services.TextService.Localize("actions", ActionDisable.Instance.Alias), 
+                false,
+                new Dictionary<string, object>
+                {
+                    {MenuItem.JsActionKey, ActionDisable.Instance.JsFunctionName}
+                }
+            );
+
+            return menu;
+        }
+    }
+}