Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP-API into dev

Author: KelvinTegelaar

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecScheduledCommand.ps1

@@ -272,7 +272,12 @@ function Push-ExecScheduledCommand {
 
         # Add alert comment if available
         if ($task.AlertComment) {
-            $HTML += "<div style='background-color: #f8f9fa; border-left: 4px solid #007bff; padding: 15px; margin: 15px 0;'><h4 style='margin-top: 0; color: #007bff;'>Alert Information</h4><p style='margin-bottom: 0;'>$($task.AlertComment)</p></div>"
+            if ($task.AlertComment -match '%resultcount%') {
+                $resultCount = if ($Results -is [array]) { $Results.Count } else { 1 }
+                $task.AlertComment = $task.AlertComment -replace '%resultcount%', "$resultCount"
+            }
+            $task.AlertComment = Get-CIPPTextReplacement -Text $task.AlertComment -TenantFilter $Tenant
+            $HTML += "<div style='background-color: transparent; border-left: 4px solid #007bff; padding: 15px; margin: 15px 0;'><h4 style='margin-top: 0; color: #007bff;'>Alert Information</h4><p style='margin-bottom: 0;'>$($task.AlertComment)</p></div>"
         }
 
         $title = "$TaskType - $Tenant - $($task.Name)"