diff options
Diffstat (limited to 'src/main.lib/Plugins/TargetPlugins/IIS/Legacy')
3 files changed, 38 insertions, 59 deletions
diff --git a/src/main.lib/Plugins/TargetPlugins/IIS/Legacy/IISBindingOptions.cs b/src/main.lib/Plugins/TargetPlugins/IIS/Legacy/IISBindingOptions.cs index 6663564..d3a1258 100644 --- a/src/main.lib/Plugins/TargetPlugins/IIS/Legacy/IISBindingOptions.cs +++ b/src/main.lib/Plugins/TargetPlugins/IIS/Legacy/IISBindingOptions.cs @@ -1,6 +1,6 @@ -using PKISharp.WACS.Plugins.Base; +using Newtonsoft.Json; +using PKISharp.WACS.Plugins.Base; using System.Collections.Generic; -using System.Linq; namespace PKISharp.WACS.Plugins.TargetPlugins { @@ -9,27 +9,13 @@ namespace PKISharp.WACS.Plugins.TargetPlugins { public long? SiteId { - get - { - if (IncludeSiteIds != null) - { - return IncludeSiteIds.FirstOrDefault(); - } - else - { - return null; - } - } + get => null; set { - if (value.HasValue) + if (IncludeSiteIds == null && value.HasValue) { IncludeSiteIds = new List<long>() { value.Value }; } - else - { - IncludeSiteIds = null; - } } } @@ -38,27 +24,13 @@ namespace PKISharp.WACS.Plugins.TargetPlugins /// </summary> public string? Host { - get - { - if (IncludeHosts != null) - { - return IncludeHosts.FirstOrDefault(); - } - else - { - return null; - } - } + get => null; set { - if (!string.IsNullOrEmpty(value)) + if (IncludeHosts == null && !string.IsNullOrEmpty(value)) { IncludeHosts = new List<string>() { value }; } - else - { - IncludeHosts = null; - } } } } diff --git a/src/main.lib/Plugins/TargetPlugins/IIS/Legacy/IISSiteOptions.cs b/src/main.lib/Plugins/TargetPlugins/IIS/Legacy/IISSiteOptions.cs index cfa0840..65fd2be 100644 --- a/src/main.lib/Plugins/TargetPlugins/IIS/Legacy/IISSiteOptions.cs +++ b/src/main.lib/Plugins/TargetPlugins/IIS/Legacy/IISSiteOptions.cs @@ -1,6 +1,5 @@ using PKISharp.WACS.Plugins.Base; using System.Collections.Generic; -using System.Linq; namespace PKISharp.WACS.Plugins.TargetPlugins { @@ -9,33 +8,25 @@ namespace PKISharp.WACS.Plugins.TargetPlugins { public long? SiteId { - get + get => null; + set { - if (IncludeSiteIds != null) - { - return IncludeSiteIds.FirstOrDefault(); - } - else + if (IncludeSiteIds == null && value.HasValue) { - return null; + IncludeSiteIds = new List<long>() { value.Value }; } } + } + + public List<string>? ExcludeBindings { + get => null; set { - if (value.HasValue) + if (ExcludeHosts == null) { - IncludeSiteIds = new List<long>() { value.Value }; - } - else - { - IncludeSiteIds = null; + ExcludeHosts = value; } } } - - public List<string>? ExcludeBindings { - get => ExcludeHosts; - set => ExcludeHosts = value; - } } } diff --git a/src/main.lib/Plugins/TargetPlugins/IIS/Legacy/IISSitesOptions.cs b/src/main.lib/Plugins/TargetPlugins/IIS/Legacy/IISSitesOptions.cs index c4e7e9c..0f8e53a 100644 --- a/src/main.lib/Plugins/TargetPlugins/IIS/Legacy/IISSitesOptions.cs +++ b/src/main.lib/Plugins/TargetPlugins/IIS/Legacy/IISSitesOptions.cs @@ -1,5 +1,4 @@ using PKISharp.WACS.Plugins.Base; -using PKISharp.WACS.Plugins.Base.Options; using System.Collections.Generic; namespace PKISharp.WACS.Plugins.TargetPlugins @@ -11,16 +10,33 @@ namespace PKISharp.WACS.Plugins.TargetPlugins /// Ignored, when this is false the other filter will be /// there, and when it's true there is no filter /// </summary> - public bool? All { get; set; } + public bool? All { + get => null; + set { } + } + public List<long>? SiteIds { - get => IncludeSiteIds; - set => IncludeSiteIds = value; + get => null; + set + { + if (IncludeSiteIds == null && value != null) + { + IncludeSiteIds = value; + } + } } + public List<string>? ExcludeBindings { - get => ExcludeHosts; - set => ExcludeHosts = value; + get => null; + set + { + if (ExcludeHosts == null) + { + ExcludeHosts = value; + } + } } } } |