Merge branch 'KelvinTegelaar:master' into master

Author: lacymooretx

Modules/CIPPCore/Public/Entrypoints/Invoke-AddStandardsDeploy.ps1

@@ -20,9 +20,9 @@ Function Invoke-AddStandardsDeploy {
         $Settings | Add-Member -NotePropertyName 'v2.1' -NotePropertyValue $true -Force
         if ($Settings.phishProtection.remediate) {
             $URL = $request.headers.'x-ms-original-url'.split('/api') | Select-Object -First 1
-            write-host $URL
+            Write-Host $URL
             $Settings.phishProtection = [pscustomobject]@{
-                remediate = $true
+                remediate = [bool]$Settings.phishProtection.remediate
                 URL       = $URL
             }
         }

Modules/CIPPCore/Public/Entrypoints/Invoke-PublicPhishingCheck.ps1

@@ -25,11 +25,11 @@ function Invoke-CIPPStandardPhishProtection {
                 New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/organization/$($TenantId.customerId)/branding/localizations/" -ContentType 'application/json' -asApp $true -Type POST -Body $defaultBrandingBody -AddedHeaders $AddedHeaders
             }
             if ($currentBody -like "*$CSS*") {
-                Write-Host 'Logon Screen Phising Protection system already active'
+                Write-Host 'Logon Screen Phishing Protection system already active'
                 Write-LogMessage -API 'Standards' -tenant $tenant -message 'Logon Screen Phishing Protection system already active' -sev Info
             } else {
                 $currentBody = $currentBody + $CSS
-                Write-Host 'Creating Logon Screen Phising Protection System'
+                Write-Host 'Creating Logon Screen Phishing Protection System'
                 New-GraphPostRequest -tenantid $tenant -Uri "https://graph.microsoft.com/beta/organization/$($TenantId.customerId)/branding/localizations/0/customCSS" -ContentType 'text/css' -asApp $true -Type PUT -Body $CSS
                 Write-LogMessage -API 'Standards' -tenant $tenant -message 'Enabled Logon Screen Phishing Protection system' -sev Info
             }
@@ -49,4 +49,4 @@ function Invoke-CIPPStandardPhishProtection {
         if ($currentBody -like "*$CSS*") { $authstate = $true } else { $authstate = $false }
         Add-CIPPBPAField -FieldName 'PhishProtection' -FieldValue [bool]$authstate -StoreAs bool -Tenant $tenant
     }
-}
+}

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

@@ -1 +1 @@
-5.0.0
+5.0.1