From eec7d42a8894eec3e52662767bec96c934ed192a Mon Sep 17 00:00:00 2001
From: "Jamie.Rees" <Jamie.Rees>
Date: Thu, 19 Jan 2017 08:45:13 +0000
Subject: [PATCH] #956

---
 Ombi.UI/Modules/UserLoginModule.cs            | 32 ++++++++++++++++++-
 .../UserManagementSettings.cshtml             |  4 +++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/Ombi.UI/Modules/UserLoginModule.cs b/Ombi.UI/Modules/UserLoginModule.cs
index 434892496..59c30a1aa 100644
--- a/Ombi.UI/Modules/UserLoginModule.cs
+++ b/Ombi.UI/Modules/UserLoginModule.cs
@@ -233,13 +233,28 @@ namespace Ombi.UI.Modules
             var result = await AuthenticationSetup(userId, username, dateTimeOffset, loginGuid, isOwner);
 
 
+            var landingSettings = await LandingPageSettings.GetSettingsAsync();
+
+            if (landingSettings.Enabled)
+            {
+                if (!landingSettings.BeforeLogin) // After Login
+                {
+                    var uri = Linker.BuildRelativeUri(Context, "LandingPageIndex");
+                    if (loginGuid != Guid.Empty)
+                    {
+                        return CustomModuleExtensions.LoginAndRedirect(this, result.LoginGuid, null, uri.ToString());
+                    }
+                    return Response.AsRedirect(uri.ToString());
+                }
+            }
+
+
             var retVal = Linker.BuildRelativeUri(Context, "SearchIndex");
             if (result.LoginGuid != Guid.Empty)
             {
                 return CustomModuleExtensions.LoginAndRedirect(this, result.LoginGuid, null, retVal.ToString());
             }
             return Response.AsJson(new { result = true, url = retVal.ToString() });
-
         }
 
         private async Task<PlexUsers> IsPlexUser(string username)
@@ -318,6 +333,21 @@ namespace Ombi.UI.Modules
 
             var m = await AuthenticationSetup(userId, username, dateTimeOffset, loginGuid, isOwner);
 
+            var landingSettings = await LandingPageSettings.GetSettingsAsync();
+
+            if (landingSettings.Enabled)
+            {
+                if (!landingSettings.BeforeLogin) // After Login
+                {
+                    var uri = Linker.BuildRelativeUri(Context, "LandingPageIndex");
+                    if (m.LoginGuid != Guid.Empty)
+                    {
+                        return CustomModuleExtensions.LoginAndRedirect(this, m.LoginGuid, null, uri.ToString());
+                    }
+                    return Response.AsRedirect(uri.ToString());
+                }
+            }
+
             var retVal = Linker.BuildRelativeUri(Context, "SearchIndex");
             if (m.LoginGuid != Guid.Empty)
             {
diff --git a/Ombi.UI/Views/UserManagementSettings/UserManagementSettings.cshtml b/Ombi.UI/Views/UserManagementSettings/UserManagementSettings.cshtml
index a48eae095..db0fae5f2 100644
--- a/Ombi.UI/Views/UserManagementSettings/UserManagementSettings.cshtml
+++ b/Ombi.UI/Views/UserManagementSettings/UserManagementSettings.cshtml
@@ -8,6 +8,10 @@
             <legend>User Management Settings</legend>
 
             <span>Here you can manage the default permissions and features that your users get</span>
+            <small>
+                Note: This will not update your users that are currently there, this is to set the default settings to any users added outside of Ombi e.g. You share your Plex Server with a new user, they will be added into Ombi
+                 automatically and will take the permissions and features you have selected below.
+            </small>
 
 
             <h3>Permissions</h3>