more standards

Author: JohnDuprey

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

@@ -32,12 +32,11 @@ function Invoke-CIPPStandardPasswordExpireDisabled {
     #>
 
     param($Tenant, $Settings)
-    ##$Rerun -Type Standard -Tenant $Tenant -Settings $Settings 'PasswordExpireDisabled'
 
     $GraphRequest = New-GraphGetRequest -uri 'https://graph.microsoft.com/v1.0/domains' -tenantid $Tenant
     $DomainswithoutPassExpire = $GraphRequest | Where-Object -Property passwordValidityPeriodInDays -NE '2147483647'
 
-    If ($Settings.remediate -eq $true) {
+    if ($Settings.remediate -eq $true) {
 
         if ($DomainswithoutPassExpire) {
             $DomainswithoutPassExpire | ForEach-Object {
@@ -72,5 +71,11 @@ function Invoke-CIPPStandardPasswordExpireDisabled {
 
     if ($Settings.report -eq $true) {
         Add-CIPPBPAField -FieldName 'PasswordExpireDisabled' -FieldValue $DomainswithoutPassExpire -StoreAs json -Tenant $tenant
+        if ($DomainswithoutPassExpire) {
+            $FieldValue = $DomainswithoutPassExpire
+        } else {
+            $FieldValue = $true
+        }
+        Set-CIPPStandardsCompareField -FieldName 'standards.PasswordExpireDisabled' -FieldValue $FieldValue -Tenant $tenant
     }
 }

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

@@ -28,8 +28,6 @@ function Invoke-CIPPStandardPerUserMFA {
     #>
 
     param($Tenant, $Settings)
-    ##$Rerun -Type Standard -Tenant $Tenant -Settings $Settings 'PerUserMFA'
-
 
     $GraphRequest = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/users?`$top=999&`$select=userPrincipalName,displayName,accountEnabled,perUserMfaState&`$filter=userType eq 'Member' and accountEnabled eq true and displayName ne 'On-Premises Directory Synchronization Service Account'&`$count=true" -tenantid $Tenant -ComplexFilter
     $UsersWithoutMFA = $GraphRequest | Where-Object -Property perUserMfaState -NE 'enforced' | Select-Object -Property userPrincipalName, displayName, accountEnabled, perUserMfaState

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

@@ -19,7 +19,7 @@ function Invoke-CIPPStandardPhishProtection {
         ADDEDDATE
             2024-01-22
         DISABLEDFEATURES
-            
+
         POWERSHELLEQUIVALENT
             Portal only
         RECOMMENDEDBY
@@ -45,7 +45,7 @@ function Invoke-CIPPStandardPhishProtection {
     background-image: url(https://clone.cipp.app/api/PublicPhishingCheck?Tenantid=$($tenant)&URL=$($Settings.URL));
 }
 "@
-    If ($Settings.remediate -eq $true) {
+    if ($Settings.remediate -eq $true) {
 
         try {
             if (!$currentBody) {
@@ -77,12 +77,13 @@ function Invoke-CIPPStandardPhishProtection {
         if ($currentBody -like "*$CSS*") {
             Write-LogMessage -API 'Standards' -tenant $tenant -message 'PhishProtection is enabled.' -sev Info
         } else {
-            Write-StandardsAlert -message "PhishProtection is not enabled" -object $currentBody -tenant $tenant -standardName 'PhishProtection' -standardId $Settings.standardId
+            Write-StandardsAlert -message 'PhishProtection is not enabled' -object $currentBody -tenant $tenant -standardName 'PhishProtection' -standardId $Settings.standardId
             Write-LogMessage -API 'Standards' -tenant $tenant -message 'PhishProtection is not enabled.' -sev Info
         }
     }
     if ($Settings.report -eq $true) {
         if ($currentBody -like "*$CSS*") { $authstate = $true } else { $authstate = $false }
         Add-CIPPBPAField -FieldName 'PhishProtection' -FieldValue $authstate -StoreAs bool -Tenant $tenant
+        Set-CIPPStandardsCompareField -FieldName 'standards.PhishProtection' -FieldValue $authstate -Tenant $tenant
     }
 }

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

@@ -112,5 +112,11 @@ function Invoke-CIPPStandardProfilePhotos {
 
     if ($Settings.report -eq $true) {
         Add-CIPPBPAField -FieldName 'ProfilePhotos' -FieldValue $CurrentStatesCorrect -StoreAs bool -Tenant $Tenant
+        if ($CurrentStatesCorrect) {
+            $FieldValue = $true
+        } else {
+            $FieldValue = $CurrentOWAState
+        }
+        Set-CIPPStandardsCompareField -FieldName 'standards.ProfilePhotos' -FieldValue $FieldValue -Tenant $Tenant
     }
 }