Merge pull request #97 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Set-CIPPAssignedPolicy.ps1

@@ -52,7 +52,7 @@ function Set-CIPPAssignedPolicy {
             }
             default {
                 Write-Host "We're supposed to assign a custom group. The group is $GroupName"
-                $GroupNames = $GroupName -split '\s,\s'
+                $GroupNames = $GroupName.Split(',').Trim()
                 $GroupIds = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/groups?$select=id,displayName&$top=999' -tenantid $TenantFilter |
                     ForEach-Object {
                         foreach ($SingleName in $GroupNames) {
@@ -75,7 +75,7 @@ function Set-CIPPAssignedPolicy {
         }
         if ($ExcludeGroup) {
             Write-Host "We're supposed to exclude a custom group. The group is $ExcludeGroup"
-            $ExcludeGroupNames = $GroupName -split '\s,\s'
+            $ExcludeGroupNames = $ExcludeGroup.Split(',').Trim()
             $ExcludeGroupIds = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/groups?$select=id,displayName&$top=999' -tenantid $TenantFilter |
                 ForEach-Object {
                     foreach ($SingleName in $ExcludeGroupNames) {

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

@@ -37,7 +37,6 @@ function Invoke-CIPPStandardIntuneTemplate {
 
         Write-Host 'starting template deploy'
         Write-Host "The full settings are $($Settings | ConvertTo-Json)"
-        $APINAME = 'Standards'
         foreach ($Template in $Settings) {
             Write-Host "working on template deploy: $($Template | ConvertTo-Json)"
             try {
@@ -53,7 +52,7 @@ function Invoke-CIPPStandardIntuneTemplate {
 
             } catch {
                 $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
-                Write-LogMessage -API 'Standards' -tenant $tenant -message "Failed to create or update Intune Template $PolicyName, Error: $ErrorMessage" -sev 'Error'
+                Write-LogMessage -API 'Standards' -tenant $tenant -message "Failed to create or update Intune Template $displayname, Error: $ErrorMessage" -sev 'Error'
             }
         }
     }