Merge pull request #287 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-listStandardTemplates.ps1

@@ -1,6 +1,6 @@
 using namespace System.Net
 
-Function Invoke-listStandardTemplates {
+function Invoke-listStandardTemplates {
     <#
     .FUNCTIONALITY
         Entrypoint,AnyTenant
@@ -29,7 +29,11 @@ Function Invoke-listStandardTemplates {
             return
         }
         $Data | Add-Member -NotePropertyName 'GUID' -NotePropertyValue $_.GUID -Force
-        if ($Data.excludedTenants) { $Data.excludedTenants = @($Data.excludedTenants) }
+        if ($Data.excludedTenants -and $Data.excludedTenants -ne 'excludedTenants') {
+            $Data.excludedTenants = @($Data.excludedTenants)
+        } else {
+            $Data.excludedTenants = @()
+        }
         $Data
     } | Sort-Object -Property templateName
 

Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXODisableAutoForwarding.ps1

@@ -38,8 +38,7 @@ function Invoke-CIPPStandardEXODisableAutoForwarding {
     $CurrentInfo = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-HostedOutboundSpamFilterPolicy' -cmdParams @{Identity = 'Default' } -useSystemMailbox $true
     $StateIsCorrect = $CurrentInfo.AutoForwardingMode -eq 'Off'
 
-    If ($Settings.remediate -eq $true) {
-
+    if ($Settings.remediate -eq $true) {
         try {
             New-ExoRequest -tenantid $tenant -cmdlet 'Set-HostedOutboundSpamFilterPolicy' -cmdParams @{ Identity = 'Default'; AutoForwardingMode = 'Off' } -useSystemMailbox $true
             Write-LogMessage -API 'Standards' -tenant $tenant -message 'Disabled auto forwarding' -sev Info
@@ -50,7 +49,6 @@ function Invoke-CIPPStandardEXODisableAutoForwarding {
     }
 
     if ($Settings.alert -eq $true) {
-
         if ($StateIsCorrect -eq $true) {
             Write-LogMessage -API 'Standards' -tenant $tenant -message 'Auto forwarding is disabled.' -sev Info
         } else {
@@ -60,9 +58,8 @@ function Invoke-CIPPStandardEXODisableAutoForwarding {
     }
 
     if ($Settings.report -eq $true) {
-        $state = $StateIsCorrect ? $true : $CurrentInfo | Select-Object autoForwardingMode
+        $state = $StateIsCorrect ?? ($CurrentInfo | Select-Object AutoForwardingMode)
         Set-CIPPStandardsCompareField -FieldName 'standards.EXODisableAutoForwarding' -FieldValue $state -TenantFilter $Tenant
         Add-CIPPBPAField -FieldName 'AutoForwardingDisabled' -FieldValue $StateIsCorrect -StoreAs bool -Tenant $tenant
     }
-
 }

Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSpamFilterPolicy.ps1

@@ -241,7 +241,7 @@ function Invoke-CIPPStandardSpamFilterPolicy {
         if ($StateIsCorrect) {
             $FieldValue = $true
         } else {
-            $FieldValue = $CurrentState ? $CurrentState : @{ state = 'Spam filter policy not found' }
+            $FieldValue = $StateIsCorrect -eq $true ? $true : ($CurrentState ?? @{ state = 'Spam filter policy not found' })
         }
         Set-CIPPStandardsCompareField -FieldName 'standards.SpamFilterPolicy' -FieldValue $FieldValue -Tenant $Tenant
     }

Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUserSubmissions.ps1

@@ -196,6 +196,8 @@ function Invoke-CIPPStandardUserSubmissions {
         if ($StateIsCorrect) {
             $FieldValue = $true
         } else {
+            $PolicyState = $PolicyState | Select-Object EnableReportToMicrosoft, ReportJunkToCustomizedAddress, ReportNotJunkToCustomizedAddress, ReportPhishToCustomizedAddress, ReportJunkAddresses, ReportNotJunkAddresses, ReportPhishAddresses
+            $RuleState = $RuleState | Select-Object State, SentTo
             $FieldValue = @{ PolicyState = $PolicyState; RuleState = $RuleState }
         }