Fix reporting

Author: KelvinTegelaar

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

@@ -43,7 +43,7 @@ function Invoke-CIPPStandardExternalMFATrusted {
     # Input validation
     if (([string]::IsNullOrWhiteSpace($state) -or $state -eq 'Select a value') -and ($Settings.remediate -eq $true -or $Settings.alert -eq $true)) {
         Write-LogMessage -API 'Standards' -tenant $Tenant -message 'ExternalMFATrusted: Invalid state parameter set' -sev Error
-        Return
+        return
     }
 
     if ($Settings.remediate -eq $true) {
@@ -66,7 +66,8 @@ function Invoke-CIPPStandardExternalMFATrusted {
     }
     if ($Settings.report -eq $true) {
         $state = $ExternalMFATrusted.inboundTrust.isMfaAccepted ? $true : $ExternalMFATrusted.inboundTrust
-        Set-CIPPStandardsCompareField -FieldName 'standards.ExternalMFATrusted' -FieldValue $ExternalMFATrusted.inboundTrust.isMfaAccepted -TenantFilter $Tenant
+        $ReportState = $ExternalMFATrusted.inboundTrust.isMfaAccepted -eq $WantedState
+        Set-CIPPStandardsCompareField -FieldName 'standards.ExternalMFATrusted' -FieldValue $ReportState -TenantFilter $Tenant
         Add-CIPPBPAField -FieldName 'ExternalMFATrusted' -FieldValue $ExternalMFATrusted.inboundTrust.isMfaAccepted -StoreAs bool -Tenant $Tenant
     }
 

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

@@ -29,7 +29,7 @@ function Invoke-CIPPStandardGroupTemplate {
     #>
     param($Tenant, $Settings)
     ##$Rerun -Type Standard -Tenant $Tenant -Settings $Settings 'GroupTemplate'
-
+    $existingGroups = New-GraphGETRequest -uri 'https://graph.microsoft.com/beta/groups?$top=999' -tenantid $tenant
     if ($Settings.remediate -eq $true) {
         #Because the list name changed from TemplateList to groupTemplate by someone :@, we'll need to set it back to TemplateList
         $Settings.groupTemplate ? ($Settings | Add-Member -NotePropertyName 'TemplateList' -NotePropertyValue $Settings.groupTemplate) : $null
@@ -40,7 +40,7 @@ function Invoke-CIPPStandardGroupTemplate {
                 $Filter = "PartitionKey eq 'GroupTemplate' and RowKey eq '$($Template.value)'"
                 $groupobj = (Get-AzDataTableEntity @Table -Filter $Filter).JSON | ConvertFrom-Json
                 $email = if ($groupobj.domain) { "$($groupobj.username)@$($groupobj.domain)" } else { "$($groupobj.username)@$($Tenant)" }
-                $CheckExististing = New-GraphGETRequest -uri 'https://graph.microsoft.com/beta/groups?$top=999' -tenantid $tenant | Where-Object -Property displayName -EQ $groupobj.displayname
+                $CheckExististing = $existingGroups | Where-Object -Property displayName -EQ $groupobj.displayname
                 $BodyToship = [pscustomobject] @{
                     'displayName'   = $groupobj.Displayname
                     'description'   = $groupobj.Description
@@ -114,4 +114,22 @@ function Invoke-CIPPStandardGroupTemplate {
             }
         }
     }
+    if ($Settings.report -eq $true) {
+        $Groups = $Settings.groupTemplate.JSON | ConvertFrom-Json -Depth 10
+        #check if all groups.displayName are in the existingGroups, if not $fieldvalue should contain all missing groups, else it should be true.
+        $MissingGroups = foreach ($Group in $Groups) {
+            $CheckExististing = $existingGroups | Where-Object -Property displayName -EQ $Group.displayname
+            if (!$CheckExististing) {
+                $Group.displayname
+            }
+        }
+
+        if ($MissingGroups.Count -eq 0) {
+            $fieldValue = $true
+        } else {
+            $fieldValue = $MissingGroups -join ', '
+        }
+
+        Set-CIPPStandardsCompareField -FieldName 'standards.SafeSendersDisable' -FieldValue $fieldValue -Tenant $Tenant
+    }
 }

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

@@ -71,8 +71,7 @@ function Invoke-CIPPStandardMailboxRecipientLimits {
         $MailboxResults = @($Mailboxes) | ForEach-Object {
 
             $Mailbox = $_
-            #if the mailbox username contains a guid, we can assume it's a system mailbox and skip it
-            if ($Mailbox.UserPrincipalName -match '^[^@]+@[^.]+\.[^.]+$') {
+            if ($Mailbox.UserPrincipalName -like 'DiscoverySearchMailbox*' -or $Mailbox.UserPrincipalName -like 'SystemMailbox*') {
                 return
             }
             # Safe hashtable lookup - check if MailboxPlanId exists and is not null