Merge pull request #186 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Get-CIPPTextReplacement.ps1

@@ -18,7 +18,17 @@ function Get-CIPPTextReplacement {
     if ($Text -isnot [string]) {
         return $Text
     }
-
+    $blacklist = @(
+        '%serial%',
+        '%systemroot%',
+        '%systemdrive%',
+        '%temp%',
+        '%tenantid%',
+        '%tenantfilter%',
+        '%tenantname%',
+        '%partnertenantid%',
+        '%samappid%'
+    )
     $Tenant = Get-Tenants -TenantFilter $TenantFilter
     $CustomerId = $Tenant.customerId
 
@@ -44,7 +54,9 @@ function Get-CIPPTextReplacement {
     # Replace custom variables
     foreach ($Replace in $Vars.GetEnumerator()) {
         $String = '%{0}%' -f $Replace.Key
-        $Text = $Text -replace $String, $Replace.Value
+        if ($string -notin $blacklist) {
+            $Text = $Text -replace $String, $Replace.Value
+        }
     }
     #default replacements for all tenants: %tenantid% becomes $tenant.customerId, %tenantfilter% becomes $tenant.defaultDomainName, %tenantname% becomes $tenant.displayName
     $Text = $Text -replace '%tenantid%', $Tenant.customerId

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

@@ -70,13 +70,18 @@ function Invoke-CIPPStandardsharingCapability {
     }
 
     if ($Settings.alert -eq $true) {
-
         if ($CurrentInfo.sharingCapability -eq $level) {
             Write-LogMessage -API 'Standards' -tenant $Tenant -message "Sharing level is set to $level" -sev Info
-            $FieldValue = $true
         } else {
             Write-StandardsAlert -message "Sharing level is not set to $level" -object $CurrentInfo -tenant $Tenant -standardName 'sharingCapability' -standardId $Settings.standardId
             Write-LogMessage -API 'Standards' -tenant $Tenant -message "Sharing level is not set to $level" -sev Info
+        }
+    }
+
+    if ($Settings.report -eq $true) {
+        if ($CurrentInfo.sharingCapability -eq $level) {
+            $FieldValue = $true
+        } else {
             $FieldValue = $CurrentInfo | Select-Object -Property sharingCapability
         }
         Set-CIPPStandardsCompareField -FieldName 'standards.sharingCapability' -FieldValue $FieldValue -Tenant $Tenant