add option for multiple input fields.

Author: KelvinTegelaar

Modules/CIPPCore/Public/Alerts/Get-CIPPAlertExpiringLicenses.ps1

@@ -11,20 +11,45 @@ function Get-CIPPAlertExpiringLicenses {
         $TenantFilter
     )
     try {
+        # Parse input parameters - default to 30 days if not specified
+        # Support both old format (direct value) and new format (object with properties)
+        if ($InputValue -is [hashtable] -or $InputValue -is [PSCustomObject]) {
+            $DaysThreshold = if ($InputValue.ExpiringLicensesDays) { [int]$InputValue.ExpiringLicensesDays } else { 30 }
+            $UnassignedOnly = if ($null -ne $InputValue.ExpiringLicensesUnassignedOnly) { [bool]$InputValue.ExpiringLicensesUnassignedOnly } else { $false }
+        } else {
+            # Backward compatibility: if InputValue is a simple value, treat it as days threshold
+            $DaysThreshold = if ($InputValue) { [int]$InputValue } else { 30 }
+            $UnassignedOnly = $false
+        }
+        
         $AlertData = Get-CIPPLicenseOverview -TenantFilter $TenantFilter | ForEach-Object {
             $TermData = $_.TermInfo | ConvertFrom-Json
+            $UnassignedCount = [int]$_.CountAvailable
+            
+            # If unassigned only filter is enabled, skip licenses with no unassigned units
+            if ($UnassignedOnly -and $UnassignedCount -le 0) {
+                return
+            }
+            
             foreach ($Term in $TermData) {
-                if ($Term.DaysUntilRenew -lt 30 -and $Term.DaysUntilRenew -gt 0) {
-                    Write-Host "$($_.License) will expire in $($Term.DaysUntilRenew) days. The estimated term is $($Term.Term)"
+                if ($Term.DaysUntilRenew -lt $DaysThreshold -and $Term.DaysUntilRenew -gt 0) {
+                    $Message = if ($UnassignedOnly) {
+                        "$($_.License) has $UnassignedCount unassigned license(s) expiring in $($Term.DaysUntilRenew) days. The estimated term is $($Term.Term)"
+                    } else {
+                        "$($_.License) will expire in $($Term.DaysUntilRenew) days. The estimated term is $($Term.Term)"
+                    }
+                    
+                    Write-Host $Message
                     [PSCustomObject]@{
-                        Message        = "$($_.License) will expire in $($Term.DaysUntilRenew) days. The estimated term is $($Term.Term)"
+                        Message        = $Message
                         License        = $_.License
                         SkuId          = $_.skuId
                         DaysUntilRenew = $Term.DaysUntilRenew
                         Term           = $Term.Term
                         Status         = $Term.Status
                         TotalLicenses  = $Term.TotalLicenses
                         CountUsed      = $_.CountUsed
+                        CountAvailable = $UnassignedCount
                         NextLifecycle  = $Term.NextLifecycle
                         Tenant         = $_.Tenant
                     }
@@ -35,5 +60,4 @@ function Get-CIPPAlertExpiringLicenses {
 
     } catch {
     }
-}
-
+}