fix reporting

Author: KelvinTegelaar

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

@@ -43,11 +43,11 @@ function Invoke-CIPPStandardDefaultSharingLink {
     $DesiredSharingLinkTypeValue = $SharingLinkTypeMap[$DesiredSharingLinkType]
 
     $CurrentState = Get-CIPPSPOTenant -TenantFilter $Tenant |
-        Select-Object -Property _ObjectIdentity_, TenantFilter, DefaultSharingLinkType, DefaultLinkPermission
+    Select-Object -Property _ObjectIdentity_, TenantFilter, DefaultSharingLinkType, DefaultLinkPermission
 
     # Check if the current state matches the desired configuration
     $StateIsCorrect = ($CurrentState.DefaultSharingLinkType -eq $DesiredSharingLinkTypeValue) -and ($CurrentState.DefaultLinkPermission -eq 1)
-
+    Write-Host "currentstate: $($CurrentState.DefaultSharingLinkType), $($CurrentState.DefaultLinkPermission). Desired: $DesiredSharingLinkTypeValue, 1"
     if ($Settings.remediate -eq $true) {
         if ($StateIsCorrect -eq $true) {
             Write-LogMessage -API 'Standards' -Tenant $Tenant -Message "Default sharing link settings are already configured correctly (Type: $DesiredSharingLinkType, Permission: View)" -Sev Info

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

@@ -27,17 +27,16 @@ function Invoke-CIPPStandardTransportRuleTemplate {
     #>
     param($Tenant, $Settings)
     ##$Rerun -Type Standard -Tenant $Tenant -Settings $Settings 'TransportRuleTemplate'
-
-    If ($Settings.remediate -eq $true) {
+    $existingRules = New-ExoRequest -ErrorAction SilentlyContinue -tenantid $Tenant -cmdlet 'Get-TransportRule' -useSystemMailbox $true
+    if ($Settings.remediate -eq $true) {
         Write-Host "Settings: $($Settings | ConvertTo-Json)"
         $Settings.transportRuleTemplate ? ($Settings | Add-Member -NotePropertyName 'TemplateList' -NotePropertyValue $Settings.transportRuleTemplate) : $null
         foreach ($Template in $Settings.TemplateList) {
             Write-Host "working on $($Template.value)"
             $Table = Get-CippTable -tablename 'templates'
             $Filter = "PartitionKey eq 'TransportTemplate' and RowKey eq '$($Template.value)'"
             $RequestParams = (Get-AzDataTableEntity @Table -Filter $Filter).JSON | ConvertFrom-Json
-            $Existing = New-ExoRequest -ErrorAction SilentlyContinue -tenantid $Tenant -cmdlet 'Get-TransportRule' -useSystemMailbox $true | Where-Object -Property Identity -EQ $RequestParams.name
-
+            $Existing = $existingRules | Where-Object -Property Identity -EQ $RequestParams.name
 
             try {
                 if ($Existing) {
@@ -58,4 +57,21 @@ function Invoke-CIPPStandardTransportRuleTemplate {
             }
         }
     }
+    if ($Settings.report -eq $true) {
+        $rules = $Settings.transportRuleTemplate.JSON | ConvertFrom-Json -Depth 10
+        $MissingRules = foreach ($rule in $rules) {
+            $CheckExististing = $existingRules | Where-Object -Property identity -EQ $rule.displayname
+            if (!$CheckExististing) {
+                $rule.displayname
+            }
+        }
+
+        if ($MissingRules.Count -eq 0) {
+            $fieldValue = $true
+        } else {
+            $fieldValue = $MissingRules -join ', '
+        }
+
+        Set-CIPPStandardsCompareField -FieldName 'standards.TransportRuleTemplate' -FieldValue $fieldValue -Tenant $Tenant
+    }
 }