Merge pull request #363 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

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

@@ -72,6 +72,10 @@ function Invoke-CIPPStandardIntuneTemplate {
             Write-Host "IntuneTemplate: $($Template.TemplateList.value) - Compared JSON: $($Compare | ConvertTo-Json -Compress)"
         } else {
             Write-Host "IntuneTemplate: $($Template.TemplateList.value) - No existing policy found."
+            $compare = [pscustomobject]@{
+                MatchFailed = $true
+                Difference  = 'This policy does not exist in Intune.'
+            }
         }
         if ($Compare) {
             Write-Host "IntuneTemplate: $($Template.TemplateList.value) - Compare found differences."
@@ -112,7 +116,7 @@ function Invoke-CIPPStandardIntuneTemplate {
         }
     }
 
-    If ($true -in $Settings.remediate) {
+    if ($true -in $Settings.remediate) {
         Write-Host 'starting template deploy'
         foreach ($TemplateFile in $CompareList | Where-Object -Property remediate -EQ $true) {
             Write-Host "working on template deploy: $($TemplateFile.displayname)"
@@ -146,7 +150,7 @@ function Invoke-CIPPStandardIntuneTemplate {
     }
 
     if ($true -in $Settings.report) {
-        foreach ($Template in $CompareList | Where-Object -Property report -EQ $true) {
+        foreach ($Template in $CompareList | Where-Object { $_.report -eq $true -or $_.remediate -eq $true }) {
             Write-Host "working on template report: $($Template.displayname)"
             $id = $Template.templateId
             $CompareObj = $Template.compare

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

@@ -33,10 +33,9 @@ function Invoke-CIPPStandardSPDirectSharing {
     param($Tenant, $Settings)
     Test-CIPPStandardLicense -StandardName 'SPDirectSharing' -TenantFilter $Tenant -RequiredCapabilities @('SHAREPOINTWAC', 'SHAREPOINTSTANDARD', 'SHAREPOINTENTERPRISE', 'ONEDRIVE_BASIC', 'ONEDRIVE_ENTERPRISE')
 
-    Write-LogMessage -API 'Standards' -Tenant $Tenant -Message 'This standard has been deprecated in favor of the "Set Default Sharing Link Settings" standard. Please update your standards to use new standard. However this will continue to function.' -Sev Alert
-
+    Write-LogMessage -API 'Standards' -Tenant $Tenant -Message 'The default sharing to Direct users standard has been deprecated in favor of the "Set Default Sharing Link Settings" standard. Please update your standards to use new standard. However this will continue to function.' -Sev Alert
     $CurrentState = Get-CIPPSPOTenant -TenantFilter $Tenant |
-        Select-Object -Property _ObjectIdentity_, TenantFilter, DefaultSharingLinkType
+    Select-Object -Property _ObjectIdentity_, TenantFilter, DefaultSharingLinkType
 
     $StateIsCorrect = ($CurrentState.DefaultSharingLinkType -eq 'Direct' -or $CurrentState.DefaultSharingLinkType -eq 1)