github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-14 02:26:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/tidusjar/PlexRequests.Net.git

Browse source
This commit is contained in:
tidusjar 2016-09-13 22:01:09 +01:00
commit a3d1cd1d2d
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
PlexRequests.UI/Modules/BaseAuthModule.cs
View file

@ -53,14 +53,15 @@ namespace PlexRequests.UI.Modules
private Response CheckAuth()
{
var settings = PlexRequestSettings.GetSettings();
var baseUrl = settings.BaseUrl;
// Have we been through the wizard?
if (!settings.Wizard)
{
return Context.GetRedirect("~/wizard");
return Context.GetRedirect(string.IsNullOrEmpty(baseUrl) ? "~/wizard" : $"~/{baseUrl}/wizard");
}
var baseUrl = settings.BaseUrl;
var redirectPath = string.IsNullOrEmpty(baseUrl) ? "~/userlogin" : $"~/{baseUrl}/userlogin";
return Session[SessionKeys.UsernameKey] == null
@ -68,4 +69,4 @@ namespace PlexRequests.UI.Modules
: null;
}
}
}
}

2
PlexRequests.UI/Modules/UserLoginModule.cs
View file

@ -216,7 +216,7 @@ namespace PlexRequests.UI.Modules
private bool IsUserInDeniedList(string username, AuthenticationSettings settings)
{
return settings.DeniedUserList.Any(x => x.Equals(username));
return settings.DeniedUserList.Any(x => x.Equals(username, StringComparison.CurrentCultureIgnoreCase));
}
}
}