Merge pull request #1060 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Get-CIPPTextReplacement.ps1

@@ -29,6 +29,8 @@ function Get-CIPPTextReplacement {
         '%serial%',
         '%systemroot%',
         '%systemdrive%',
+        '%system32%',
+        '%osdrive%',
         '%temp%',
         '%tenantid%',
         '%tenantfilter%',

Modules/CIPPCore/Public/New-CIPPBackupTask.ps1

@@ -27,7 +27,7 @@ function New-CIPPBackupTask {
         }
         'users' {
             Measure-CippTask -TaskName 'Users' -EventName 'CIPP.BackupCompleted' -Script {
-                New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/users?$top=999' -tenantid $TenantFilter | Select-Object * -ExcludeProperty mail, provisionedPlans, onPrem*, *passwordProfile*, *serviceProvisioningErrors*, isLicenseReconciliationNeeded, isManagementRestricted, isResourceAccount, *date*, *external*, identities, deletedDateTime, isSipEnabled, assignedPlans, cloudRealtimeCommunicationInfo, deviceKeys, provisionedPlan, securityIdentifier | ForEach-Object {
+                New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/users?$top=999' -tenantid $TenantFilter | Select-Object * -ExcludeProperty mail, provisionedPlans, onPrem*, *passwordProfile*, *serviceProvisioningErrors*, isLicenseReconciliationNeeded, isManagementRestricted, isResourceAccount, *date*, *external*, identities, deletedDateTime, imAddresses, isSipEnabled, assignedPlans, cloudRealtimeCommunicationInfo, deviceKeys, provisionedPlan, securityIdentifier | ForEach-Object {
                     #remove the property if the value is $null
                     $_.psobject.properties | Where-Object { $null -eq $_.Value } | ForEach-Object {
                         $_.psobject.properties.Remove($_.Name)

Modules/CIPPCore/Public/New-CIPPRestoreTask.ps1

@@ -39,7 +39,7 @@ function New-CIPPRestoreTask {
     # Helper function to clean user object for Graph API - removes reference properties, nulls, and empty strings
     function Clean-GraphObject {
         param($Object, [switch]$ExcludeId)
-        $excludeProps = @('password', 'passwordProfile', '@odata.type', 'manager', 'memberOf', 'createdOnBehalfOf', 'createdByAppId', 'deletedDateTime', 'authorizationInfo')
+        $excludeProps = @('password', 'passwordProfile', '@odata.type', 'manager', 'memberOf', 'createdOnBehalfOf', 'createdByAppId', 'deletedDateTime', 'authorizationInfo', 'imAddresses')
         if ($ExcludeId) {
             $excludeProps += @('id')
         }