diff options
Diffstat (limited to 'MediaBrowser.Model')
6 files changed, 56 insertions, 3 deletions
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index 230680ff2..44bf52ff6 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -176,7 +176,7 @@ namespace MediaBrowser.Model.Configuration public PeopleMetadataOptions PeopleMetadataOptions { get; set; } public bool FindInternetTrailers { get; set; } - public string[] InsecureApps2 { get; set; } + public string[] InsecureApps3 { get; set; } public bool SaveMetadataHidden { get; set; } @@ -228,12 +228,14 @@ namespace MediaBrowser.Model.Configuration PeopleMetadataOptions = new PeopleMetadataOptions(); - InsecureApps2 = new[] + InsecureApps3 = new[] { "Roku", "Chromecast", "iOS", - "Windows Phone" + "Windows Phone", + "Windows RT", + "Xbmc" }; MetadataOptions = new[] diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs index 7f46c30f0..838f659c4 100644 --- a/MediaBrowser.Model/Configuration/UserConfiguration.cs +++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs @@ -83,6 +83,8 @@ namespace MediaBrowser.Model.Configuration public AccessSchedule[] AccessSchedules { get; set; } public bool EnableUserPreferenceAccess { get; set; } + + public string[] LatestItemsExcludes { get; set; } /// <summary> /// Initializes a new instance of the <see cref="UserConfiguration" /> class. @@ -94,6 +96,7 @@ namespace MediaBrowser.Model.Configuration EnableMediaPlayback = true; EnableLiveTvAccess = true; + LatestItemsExcludes = new string[] { }; OrderedViews = new string[] { }; BlockedMediaFolders = new string[] { }; DisplayChannelsWithinViews = new string[] { }; diff --git a/MediaBrowser.Model/Connect/ConnectAuthorization.cs b/MediaBrowser.Model/Connect/ConnectAuthorization.cs index 329d805f1..0c545f4ba 100644 --- a/MediaBrowser.Model/Connect/ConnectAuthorization.cs +++ b/MediaBrowser.Model/Connect/ConnectAuthorization.cs @@ -7,5 +7,14 @@ namespace MediaBrowser.Model.Connect public string UserName { get; set; } public string ImageUrl { get; set; } public string Id { get; set; } + public string[] ExcludedLibraries { get; set; } + public bool EnableLiveTv { get; set; } + public string[] ExcludedChannels { get; set; } + + public ConnectAuthorization() + { + ExcludedLibraries = new string[] { }; + ExcludedChannels = new string[] { }; + } } } diff --git a/MediaBrowser.Model/Connect/ConnectAuthorizationRequest.cs b/MediaBrowser.Model/Connect/ConnectAuthorizationRequest.cs new file mode 100644 index 000000000..d40d353f0 --- /dev/null +++ b/MediaBrowser.Model/Connect/ConnectAuthorizationRequest.cs @@ -0,0 +1,18 @@ + +namespace MediaBrowser.Model.Connect +{ + public class ConnectAuthorizationRequest + { + public string SendingUserId { get; set; } + public string ConnectUserName { get; set; } + public string[] ExcludedLibraries { get; set; } + public bool EnableLiveTv { get; set; } + public string[] ExcludedChannels { get; set; } + + public ConnectAuthorizationRequest() + { + ExcludedLibraries = new string[] { }; + ExcludedChannels = new string[] { }; + } + } +} diff --git a/MediaBrowser.Model/Connect/ConnectPassword.cs b/MediaBrowser.Model/Connect/ConnectPassword.cs new file mode 100644 index 000000000..6ed9f0339 --- /dev/null +++ b/MediaBrowser.Model/Connect/ConnectPassword.cs @@ -0,0 +1,19 @@ + +namespace MediaBrowser.Model.Connect +{ + public static class ConnectPassword + { + public static string PerformPreHashFilter(string password) + { + return password + .Replace("&", "&") + .Replace("/", "\") + .Replace("!", "!") + .Replace("$", "$") + .Replace("\"", """) + .Replace("<", "<") + .Replace(">", ">") + .Replace("'", "'"); + } + } +} diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index 24bf2c93c..55fb8d02b 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -103,6 +103,8 @@ <Compile Include="Connect\ConnectAuthenticationExchangeResult.cs" /> <Compile Include="Connect\ConnectAuthenticationResult.cs" /> <Compile Include="Connect\ConnectAuthorization.cs" /> + <Compile Include="Connect\ConnectAuthorizationRequest.cs" /> + <Compile Include="Connect\ConnectPassword.cs" /> <Compile Include="Connect\ConnectUser.cs" /> <Compile Include="Connect\ConnectUserQuery.cs" /> <Compile Include="Connect\ConnectUserServer.cs" /> |