Skip to content

Commit

Permalink
FIxed bug where the ToTerminated warning could not be ignored
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisjantzen committed Dec 28, 2023
1 parent 22d4ab6 commit aa58543
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions User Audit.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Created Date: Tuesday, August 2nd 2022, 10:36:05 am
# Author: Chris Jantzen
# -----
# Last Modified: Thu Oct 26 2023
# Last Modified: Thu Dec 28 2023
# Modified By: Chris Jantzen
# -----
# Copyright (c) 2023 Sea to Sky Network Solutions
Expand Down Expand Up @@ -2878,7 +2878,7 @@ if ($FullMatches) {
if (!$O365Match) {
# If no O365 account or AD account:
# ToTerminated
if (((!$HasAD -and $CheckAD) -or !$CheckAD) -and $ContactType -ne 'Terminated') {
if (((!$HasAD -and $CheckAD) -or !$CheckAD) -and $ContactType -ne 'Terminated' -and 'ToTerminated' -notin $IgnoreWarnings) {
$WarnObj = @{
id = $MatchID
category = 'None'
Expand Down Expand Up @@ -3573,7 +3573,7 @@ if ($ExportChoice -eq 'Yes') {
$FullContactList.attributes | Add-Member -MemberType NoteProperty -Name ID -Value $null
$FullContactList | ForEach-Object { $_.attributes.id = $_.id }
if ($CheckChanges) {
$HistoryContactList.attributes | Add-Member -MemberType NoteProperty -Name ID -Value $null
$HistoryContactList.attributes | Add-Member -MemberType NoteProperty -Name ID -Value $null -ErrorAction Ignore
$HistoryContactList | ForEach-Object { $_.attributes.id = $_.id }
$HistoryContactList = $HistoryContactList.attributes
$HistoryChanges = Compare-Object $HistoryContactList $FullContactList.attributes -Property id, name, contact-type-name
Expand Down
4 changes: 2 additions & 2 deletions User_Billing_Update.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Created Date: Tuesday, August 2nd 2022, 10:36:05 am
# Author: Chris Jantzen
# -----
# Last Modified: Fri Nov 24 2023
# Last Modified: Thu Dec 28 2023
# Modified By: Chris Jantzen
# -----
# Copyright (c) 2023 Sea to Sky Network Solutions
Expand Down Expand Up @@ -1351,7 +1351,7 @@ if ($UserAudit) {
if (!$O365Match) {
# If no O365 account or AD account:
# ToTerminated
if (((!$HasAD -and $CheckAD) -or !$CheckAD) -and $ContactType -ne 'Terminated') {
if (((!$HasAD -and $CheckAD) -or !$CheckAD) -and $ContactType -ne 'Terminated' -and 'ToTerminated' -notin $IgnoreWarnings) {
$WarnObj = @{
id = $MatchID
category = 'None'
Expand Down
2 changes: 1 addition & 1 deletion currentversion.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.18.5
2.18.6

0 comments on commit aa58543

Please sign in to comment.