Update example

Examples/Example-40-ShowGPO01.ps1

@@ -1,16 +1,21 @@
 Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force
 
-#$Output = Invoke-GPOZaurr -FilePath $PSScriptRoot\Reports\GPOZaurr.html -PassThru -Type GPOConsistency, GPOList, GPODuplicates, GPOBroken, GPOOwners, NetLogonOwners, GPOPermissionsRead, GPOPermissionsAdministrative,GPOPermissionsUnknown
+Invoke-GPOZaurr -Type GPOOrganizationalUnit -Online -FilePath $PSScriptRoot\Reports\GPOZaurr.html
+
+return
 
 # Shows how to use exclusions (supported only in GPOBlockedInheritance)
 Invoke-GPOZaurr -FilePath $PSScriptRoot\Reports\GPOZaurr.html -Type GPOBlockedInheritance -Online -Exclusions @(
     'OU=Test,OU=ITR02,DC=ad,DC=evotec,DC=xyz'
 )
 
-<#
+# different approach to query multiple reports or just one
+Invoke-GPOZaurr -FilePath $PSScriptRoot\Reports\GPOZaurr.html -PassThru -Type GPOConsistency, GPOList, GPODuplicates, GPOBroken, GPOOwners, NetLogonOwners, GPOPermissionsRead, GPOPermissionsAdministrative,GPOPermissionsUnknown
+
+Invoke-GPOZaurr -Type GPOOwners -Online -FilePath $PSScriptRoot\Reports\GPOZaurr.html
+
 # Shows how to use exclusions for GPOList (different way)
 Invoke-GPOZaurr -FilePath $PSScriptRoot\Reports\GPOZaurr.html -Type GPOList -Online -Exclusions {
     Skip-GroupPolicy -Name 'de14_usr_std'
     Skip-GroupPolicy -Name 'ALL | Enable RDP' -DomaiName 'ad.evotec.xyz'
-}
-#>
+}

GPOZaurr.psd1

@@ -8,7 +8,7 @@
     Description          = 'Group Policy Eater is a PowerShell module that aims to gather information about Group Policies but also allows fixing issues that you may find in them.'
     FunctionsToExport    = @('Add-GPOPermission', 'Add-GPOZaurrPermission', 'Backup-GPOZaurr', 'Clear-GPOZaurrSysvolDFSR', 'ConvertFrom-CSExtension', 'Find-CSExtension', 'Get-GPOZaurr', 'Get-GPOZaurrAD', 'Get-GPOZaurrBackupInformation', 'Get-GPOZaurrBroken', 'Get-GPOZaurrBrokenLink', 'Get-GPOZaurrDictionary', 'Get-GPOZaurrDuplicateObject', 'Get-GPOZaurrFiles', 'Get-GPOZaurrFilesPolicyDefinition', 'Get-GPOZaurrFolders', 'Get-GPOZaurrInheritance', 'Get-GPOZaurrLegacyFiles', 'Get-GPOZaurrLink', 'Get-GPOZaurrLinkSummary', 'Get-GPOZaurrNetLogon', 'Get-GPOZaurrOrganizationalUnit', 'Get-GPOZaurrOwner', 'Get-GPOZaurrPassword', 'Get-GPOZaurrPermission', 'Get-GPOZaurrPermissionAnalysis', 'Get-GPOZaurrPermissionConsistency', 'Get-GPOZaurrPermissionIssue', 'Get-GPOZaurrPermissionRoot', 'Get-GPOZaurrPermissionSummary', 'Get-GPOZaurrSysvolDFSR', 'Get-GPOZaurrWMI', 'Invoke-GPOZaurr', 'Invoke-GPOZaurrContent', 'Invoke-GPOZaurrPermission', 'Invoke-GPOZaurrSupport', 'New-GPOZaurrWMI', 'Optimize-GPOZaurr', 'Remove-GPOPermission', 'Remove-GPOZaurr', 'Remove-GPOZaurrBroken', 'Remove-GPOZaurrDuplicateObject', 'Remove-GPOZaurrFolders', 'Remove-GPOZaurrLegacyFiles', 'Remove-GPOZaurrLinkEmptyOU', 'Remove-GPOZaurrPermission', 'Remove-GPOZaurrWMI', 'Repair-GPOZaurrBrokenLink', 'Repair-GPOZaurrNetLogonOwner', 'Repair-GPOZaurrPermission', 'Repair-GPOZaurrPermissionConsistency', 'Restore-GPOZaurr', 'Save-GPOZaurrFiles', 'Set-GPOOwner', 'Set-GPOZaurrOwner', 'Set-GPOZaurrStatus', 'Skip-GroupPolicy')
     GUID                 = 'f7d4c9e4-0298-4f51-ad77-e8e3febebbde'
-    ModuleVersion        = '0.0.130'
+    ModuleVersion        = '0.0.137'
     PowerShellVersion    = '5.1'
     PrivateData          = @{
         PSData = @{

Private/Invoke.GPOZaurrBlockedInheritance.ps1

@@ -110,6 +110,22 @@
             } -FontSize 10pt
         }
         New-HTMLText -FontSize 10pt -Text "Please review output in table and follow the steps below table to get Active Directory Group Policies in healthy state."
+
+        if ($Script:Reporting['GPOBlockedInheritance']['Exclusions']) {
+            New-HTMLText -LineBreak
+            New-HTMLText -Text @(
+                "While preparing this report following exclusions were defined. "
+                "Please make sure that when you execute your steps to include those exclusions to prevent any issues. "
+            ) -FontSize 10pt -FontWeight bold, normal -Color Red, None -LineBreak
+
+            New-HTMLText -Text "Code to use for exclusions: " -FontSize 10pt -FontWeight bold -LineBreak
+
+            $Code = New-GPOZaurrExclusions -ExclusionsArray $Script:Reporting['GPOBlockedInheritance']['Exclusions']
+
+            if ($Code) {
+                New-HTMLCodeBlock -Code $Code -Style powershell
+            }
+        }
     }
     Solution       = {
         New-HTMLSection -Invisible {

Private/Invoke.GPOZaurrList.ps1

@@ -51,9 +51,17 @@
                 # Skip GPOS that are younger than 30 days
                 $Script:Reporting['GPOList']['Variables']['GPOSkip']++
             }
-            if (($GPO.Enabled -eq $false -or $GPO.Empty -eq $true -or $GPO.Linked -eq $false -or $GPO.ApplyPermission -eq $false) -and $GPO.Days -le $Script:Reporting['GPOList']['Variables']['GPOOlderThan']) {
+            if ($GPO.Exclude -eq $true) {
+                # Skip GPOS that are excluded
+                $Script:Reporting['GPOList']['Variables']['GPOSkipExcluded']++
+            }
+            if (($GPO.Enabled -eq $false -or $GPO.Empty -eq $true -or $GPO.Linked -eq $false -or $GPO.ApplyPermission -eq $false) -and $GPO.Exclude -eq $true) {
+                $Script:Reporting['GPOList']['Variables']['GPONotValidButExcluded']++
+                $Script:Reporting['GPOList']['Variables']['GPONotValidButSkippedOrExcluded']++
+            } elseif (($GPO.Enabled -eq $false -or $GPO.Empty -eq $true -or $GPO.Linked -eq $false -or $GPO.ApplyPermission -eq $false) -and $GPO.Days -le $Script:Reporting['GPOList']['Variables']['GPOOlderThan']) {
                 # Skip GPOS that are younger than 30 days
                 $Script:Reporting['GPOList']['Variables']['GPONotValidButSkip']++
+                $Script:Reporting['GPOList']['Variables']['GPONotValidButSkippedOrExcluded']++
             }
             if (($GPO.Enabled -eq $false -or $GPO.Empty -eq $true -or $GPO.Linked -eq $false -or $GPO.ApplyPermission -eq $false) -and $GPO.Days) {
                 $Script:Reporting['GPOList']['Variables']['GPONotValid']++
@@ -141,52 +149,55 @@
             }
         }
         $Script:Reporting['GPOList']['Variables']['GPOTotal'] = $Script:Reporting['GPOList']['Data'].Count
-        if ($Script:Reporting['GPOList']['Variables']['GPONotValid'] -gt 0 -and $Script:Reporting['GPOList']['Variables']['GPONotValidButSkip'] -ne $Script:Reporting['GPOList']['Variables']['GPONotValid']) {
+        if ($Script:Reporting['GPOList']['Variables']['GPONotValid'] -gt 0 -and $Script:Reporting['GPOList']['Variables']['GPONotValidButSkippedOrExcluded'] -ne $Script:Reporting['GPOList']['Variables']['GPONotValid']) {
             $Script:Reporting['GPOList']['ActionRequired'] = $true
         } else {
             $Script:Reporting['GPOList']['ActionRequired'] = $false
         }
     }
     Variables  = @{
-        GPOOlderThan                   = 30
-        GPONotValidPerDomain           = $null
-        GPOValidPerDomain              = $null
-        GPONotOptimizedPerDomain       = $null
-        GPOOptimizedPerDomain          = $null
-        GPOProblemPerDomain            = $null
-        GPONoProblemPerDomain          = $null
-        GPOApplyPermissionYesPerDomain = $null
-        GPOApplyPermissionNoPerDomain  = $null
-        GPOWithProblems                = 0
-        ComputerOptimizedYes           = 0
-        ComputerOptimizedNo            = 0
-        ComputerProblemYes             = 0
-        ComputerProblemNo              = 0
-        UserOptimizedYes               = 0
-        UserOptimizedNo                = 0
-        UserProblemYes                 = 0
-        UserProblemNo                  = 0
-        GPOOptimized                   = 0
-        GPONotOptimized                = 0
-        GPOProblem                     = 0
-        GPONoProblem                   = 0
-        GPONotLinked                   = 0
-        GPOLinked                      = 0
-        GPOEmpty                       = 0
-        GPONotEmpty                    = 0
-        GPOEmptyAndUnlinked            = 0
-        GPOEmptyOrUnlinked             = 0
-        GPOLinkedButEmpty              = 0
-        GPOEnabled                     = 0
-        GPODisabled                    = 0
-        GPOSkip                        = 0
-        GPOValid                       = 0
-        GPONotValid                    = 0
-        GPONotValidButSkip             = 0
-        GPOLinkedButLinkDisabled       = 0
-        GPOTotal                       = 0
-        ApplyPermissionYes             = 0
-        ApplyPermissionNo              = 0
+        GPOOlderThan                    = 30
+        GPONotValidPerDomain            = $null
+        GPOValidPerDomain               = $null
+        GPONotOptimizedPerDomain        = $null
+        GPOOptimizedPerDomain           = $null
+        GPOProblemPerDomain             = $null
+        GPONoProblemPerDomain           = $null
+        GPOApplyPermissionYesPerDomain  = $null
+        GPOApplyPermissionNoPerDomain   = $null
+        GPOWithProblems                 = 0
+        ComputerOptimizedYes            = 0
+        ComputerOptimizedNo             = 0
+        ComputerProblemYes              = 0
+        ComputerProblemNo               = 0
+        UserOptimizedYes                = 0
+        UserOptimizedNo                 = 0
+        UserProblemYes                  = 0
+        UserProblemNo                   = 0
+        GPOOptimized                    = 0
+        GPONotOptimized                 = 0
+        GPOProblem                      = 0
+        GPONoProblem                    = 0
+        GPONotLinked                    = 0
+        GPOLinked                       = 0
+        GPOEmpty                        = 0
+        GPONotEmpty                     = 0
+        GPOEmptyAndUnlinked             = 0
+        GPOEmptyOrUnlinked              = 0
+        GPOLinkedButEmpty               = 0
+        GPOEnabled                      = 0
+        GPODisabled                     = 0
+        GPOSkip                         = 0
+        GPOSkipExcluded                 = 0
+        GPOValid                        = 0
+        GPONotValid                     = 0
+        GPONotValidButSkip              = 0
+        GPONotValidButExcluded          = 0
+        GPONotValidButSkippedOrExcluded = 0
+        GPOLinkedButLinkDisabled        = 0
+        GPOTotal                        = 0
+        ApplyPermissionYes              = 0
+        ApplyPermissionNo               = 0
     }
     Overview   = {
 
@@ -202,6 +213,7 @@
         New-HTMLList -Type Unordered {
             New-HTMLListItem -Text 'Group Policies total: ', $Script:Reporting['GPOList']['Variables']['GPOTotal'] -FontWeight normal, bold
             New-HTMLListItem -Text "Group Policies valid: ", $Script:Reporting['GPOList']['Variables']['GPOValid'] -FontWeight normal, bold
+            New-HTMLListItem -Text "Group Policies exclusions defined: ", $Script:Reporting['GPOList']['Variables']['GPOSkipExcluded'] -FontWeight normal, bold -Color None, DeepSkyBlue
             New-HTMLListItem -Text "Group Policies ", "NOT", " valid: ", $Script:Reporting['GPOList']['Variables']['GPONotValid'] -FontWeight normal, bold, normal, bold {
                 New-HTMLList -Type Unordered {
                     New-HTMLListItem -Text 'Group Policies that are unlinked (are not doing anything currently): ', $Script:Reporting['GPOList']['Variables']['GPONotLinked'] -FontWeight normal, bold
@@ -213,7 +225,10 @@
                 }
             } -Color Black, Red, Black, Red, Black
             New-HTMLListItem -Text @(
-                "Group Policies ", "NOT", " valid, to skip: ", $Script:Reporting['GPOList']['Variables']['GPONotValidButSkip'], " (modified less than $($Script:Reporting['GPOList']['Variables']['GPOOlderThan']) days ago)"
+                "Group Policies ", "NOT", " valid, to skip (because of age): ", $Script:Reporting['GPOList']['Variables']['GPONotValidButSkip'], " (modified less than $($Script:Reporting['GPOList']['Variables']['GPOOlderThan']) days ago)"
+            ) -FontWeight 'normal', 'bold', 'normal', 'bold', 'normal' -Color 'Black', 'Red', 'Black', 'Red', 'Black'
+            New-HTMLListItem -Text @(
+                "Group Policies ", "NOT", " valid, to skip (because of exclusions): ", $Script:Reporting['GPOList']['Variables']['GPONotValidButExcluded']
             ) -FontWeight 'normal', 'bold', 'normal', 'bold', 'normal' -Color 'Black', 'Red', 'Black', 'Red', 'Black'
             New-HTMLListItem -Text "Group Policies recently modified: ", $Script:Reporting['GPOList']['Variables']['GPOSkip'], " (modified less than $($Script:Reporting['GPOList']['Variables']['GPOOlderThan']) days ago)" -FontWeight normal, bold
         } -FontSize 10pt
@@ -298,6 +313,22 @@
             New-HTMLListItem -Text 'Invoke-GPOZaurr -FilePath $Env:UserProfile\Desktop\GPOZaurrGPOPListBefore.html -Verbose -Type GPOList' -Color RoyalBlue
         } -FontSize 10pt
         New-HTMLText -FontSize 10pt -Text 'Steps above will generate above summary with more details allowing you to get up to date report and steps on how to fix it.'
+
+        if ($Script:Reporting['GPOList']['Exclusions']) {
+            New-HTMLText -LineBreak
+            New-HTMLText -Text @(
+                "While preparing this report following exclusions were defined. "
+                "Please make sure that when you execute your steps to include those exclusions to prevent any issues. "
+            ) -FontSize 10pt -FontWeight bold, normal -Color Red, None -LineBreak
+
+            New-HTMLText -Text "Code to use for exclusions: " -FontSize 10pt -FontWeight bold -LineBreak
+
+            $Code = New-GPOZaurrExclusions -ExclusionsArray $Script:Reporting['GPOList']['Exclusions']
+
+            if ($Code) {
+                New-HTMLCodeBlock -Code $Code -Style powershell
+            }
+        }
     }
     Solution   = {
         New-HTMLSection -Invisible {

Private/Invoke.GPOZaurrNetLogonPermissions.ps1

@@ -125,97 +125,6 @@
         New-HTMLText -Text "Please review output in table and follow the steps below table to get NetLogon permissions in order." -FontSize 10pt
     }
     Solution       = {
-        # New-HTMLTab -Name 'NetLogon Owners' {
-        #     New-HTMLSection -Invisible {
-        #         New-HTMLPanel {
-        #             & $Script:GPOConfiguration['NetLogonPermissions']['Summary']
-        #         }
-        #         New-HTMLPanel {
-        #             New-HTMLChart {
-        #                 New-ChartPie -Name 'Correct Owners' -Value $Script:Reporting['NetLogonPermissions']['Variables']['NetLogonOwnersAdministrators'] -Color LightGreen
-        #                 New-ChartPie -Name 'Incorrect Owners' -Value $Script:Reporting['NetLogonPermissions']['Variables']['NetLogonOwnersToFix'] -Color Crimson
-        #             } -Title 'NetLogon Owners' -TitleAlignment center
-        #         }
-        #     }
-        #     New-HTMLSection -Name 'NetLogon File Owners' {
-        #         New-HTMLTable -DataTable $Script:Reporting['NetLogonPermissions']['Variables']['Owner'] -Filtering {
-        #             New-HTMLTableCondition -Name 'PrincipalSid' -Value "S-1-5-32-544" -BackgroundColor LightGreen -ComparisonType string
-        #             New-HTMLTableCondition -Name 'PrincipalSid' -Value "S-1-5-32-544" -BackgroundColor Salmon -ComparisonType string -Operator ne
-        #             New-HTMLTableCondition -Name 'PrincipalType' -Value "WellKnownAdministrative" -BackgroundColor LightGreen -ComparisonType string -Operator eq
-        #             New-HTMLTableCondition -Name 'Status' -Value "OK" -BackgroundColor LightGreen -ComparisonType string -Operator eq
-        #             New-HTMLTableCondition -Name 'Status' -Value "OK" -BackgroundColor Salmon -ComparisonType string -Operator ne
-        #         }
-        #     }
-        #     New-HTMLSection -Name 'Steps to fix NetLogon Owners ' {
-        #         New-HTMLContainer {
-        #             New-HTMLSpanStyle -FontSize 10pt {
-        #                 New-HTMLText -Text 'Following steps will guide you how to fix NetLogon Owners and make them compliant.'
-        #                 New-HTMLWizard {
-        #                     New-HTMLWizardStep -Name 'Prepare environment' {
-        #                         New-HTMLText -Text "To be able to execute actions in automated way please install required modules. Those modules will be installed straight from Microsoft PowerShell Gallery."
-        #                         New-HTMLCodeBlock -Code {
-        #                             Install-Module GPOZaurr -Force
-        #                             Import-Module GPOZaurr -Force
-        #                         } -Style powershell
-        #                         New-HTMLText -Text "Using force makes sure newest version is downloaded from PowerShellGallery regardless of what is currently installed. Once installed you're ready for next step."
-        #                     }
-        #                     New-HTMLWizardStep -Name 'Prepare report' {
-        #                         New-HTMLText -Text "Depending when this report was run you may want to prepare new report before proceeding with removal. To generate new report please use:"
-        #                         New-HTMLCodeBlock -Code {
-        #                             Invoke-GPOZaurr -FilePath $Env:UserProfile\Desktop\GPOZaurrNetLogonBefore.html -Verbose -Type NetLogon
-        #                         }
-        #                         New-HTMLText -TextBlock {
-        #                             "When executed it will take a while to generate all data and provide you with new report depending on size of environment."
-        #                             "Once confirmed that data is still showing issues and requires fixing please proceed with next step."
-        #                         }
-        #                         New-HTMLText -Text "Alternatively if you prefer working with console you can run: "
-        #                         New-HTMLCodeBlock -Code {
-        #                             $NetLogonOutput = Get-GPOZaurrNetLogon -OwnerOnly -Verbose
-        #                             $NetLogonOutput | Format-Table
-        #                         }
-        #                         New-HTMLText -Text "It provides same data as you see in table above just doesn't prettify it for you."
-        #                     }
-        #                     New-HTMLWizardStep -Name 'Set non-compliant file owners to BUILTIN\Administrators' {
-        #                         New-HTMLText -Text "Following command when executed runs internally command that lists all file owners and if it doesn't match changes it BUILTIN\Administrators. It doesn't change compliant owners."
-        #                         New-HTMLText -Text "Make sure when running it for the first time to run it with ", "WhatIf", " parameter as shown below to prevent accidental removal." -FontWeight normal, bold, normal -Color Black, Red, Black
-
-        #                         New-HTMLCodeBlock -Code {
-        #                             Repair-GPOZaurrNetLogonOwner -Verbose -WhatIf
-        #                         }
-        #                         New-HTMLText -TextBlock {
-        #                             "After execution please make sure there are no errors, make sure to review provided output, and confirm that what is about to be changed matches expected data. Once happy with results please follow with command: "
-        #                         }
-        #                         New-HTMLCodeBlock -Code {
-        #                             Repair-GPOZaurrNetLogonOwner -Verbose -LimitProcessing 2
-        #                         }
-        #                         New-HTMLText -TextBlock {
-        #                             "This command when executed sets new owner only on first X non-compliant NetLogon files. Use LimitProcessing parameter to prevent mass change and increase the counter when no errors occur."
-        #                             "Repeat step above as much as needed increasing LimitProcessing count till there's nothing left. In case of any issues please review and action accordingly."
-        #                         }
-        #                     }
-        #                     New-HTMLWizardStep -Name 'Verification report' {
-        #                         New-HTMLText -TextBlock {
-        #                             "Once cleanup task was executed properly, we need to verify that report now shows no problems."
-        #                         }
-        #                         New-HTMLCodeBlock -Code {
-        #                             Invoke-GPOZaurr -FilePath $Env:UserProfile\Desktop\GPOZaurrNetLogonAfter.html -Verbose -Type NetLogon
-        #                         }
-        #                         New-HTMLText -Text "If everything is healthy in the report you're done! Enjoy rest of the day!" -Color BlueDiamond
-        #                     }
-        #                 } -RemoveDoneStepOnNavigateBack -Theme arrows -ToolbarButtonPosition center -EnableAllAnchors
-        #             }
-        #         }
-        #     }
-        #     if ($Script:Reporting['NetLogonPermissions']['WarningsAndErrors']) {
-        #         New-HTMLSection -Name 'Warnings & Errors to Review' {
-        #             New-HTMLTable -DataTable $Script:Reporting['NetLogonPermissions']['WarningsAndErrors'] -Filtering {
-        #                 New-HTMLTableCondition -Name 'Type' -Value 'Warning' -BackgroundColor SandyBrown -ComparisonType string -Row
-        #                 New-HTMLTableCondition -Name 'Type' -Value 'Error' -BackgroundColor Salmon -ComparisonType string -Row
-        #             }
-        #         }
-        #     }
-        # }
-        #New-HTMLTab -Name 'NetLogon Permissions' {
         New-HTMLSection -Invisible {
             New-HTMLPanel {
                 & $Script:GPOConfiguration['NetLogonPermissions']['Summary']

Private/Invoke.GPOZaurrOrganizationalUnit.ps1

@@ -21,7 +21,7 @@
                 $Script:Reporting['GPOOrganizationalUnit']['Variables']['WillFixPerDomain'][$OU.DomainName] = 0
             }
             if ($OU.Status -contains 'Unlink GPO' -and $OU.Status -contains 'Delete OU') {
-                $Script:Reporting['GPOOrganizationalUnit']['Variables']['UnlinkGPODeleteOU']++
+                $Script:Reporting['GPOOrganizationalUnit']['Variables']['UnlinkGPOEmpty']++
                 $Script:Reporting['GPOOrganizationalUnit']['Variables']['WillFix']++
                 $Script:Reporting['GPOOrganizationalUnit']['Variables']['WillFixPerDomain'][$OU.DomainName]++
             } elseif ($OU.Status -contains 'Unlink GPO') {
@@ -30,8 +30,8 @@
                 $Script:Reporting['GPOOrganizationalUnit']['Variables']['WillFixPerDomain'][$OU.DomainName]++
             } elseif ($OU.Status -contains 'Delete OU') {
                 $Script:Reporting['GPOOrganizationalUnit']['Variables']['DeleteOU']++
-                $Script:Reporting['GPOOrganizationalUnit']['Variables']['WillFix']++
-                $Script:Reporting['GPOOrganizationalUnit']['Variables']['WillFixPerDomain'][$OU.DomainName]++
+                #$Script:Reporting['GPOOrganizationalUnit']['Variables']['WillFix']++
+                #$Script:Reporting['GPOOrganizationalUnit']['Variables']['WillFixPerDomain'][$OU.DomainName]++
             } elseif ($OU.Status -contains 'Excluded') {
                 $Script:Reporting['GPOOrganizationalUnit']['Variables']['Excluded']++
                 $Script:Reporting['GPOOrganizationalUnit']['Variables']['ExcludedOU'].Add($OU.Organizationalunit)
@@ -46,15 +46,15 @@
         }
     }
     Variables      = @{
-        TotalOU           = 0
-        UnlinkGPO         = 0
-        UnlinkGPODeleteOU = 0
-        DeleteOU          = 0
-        Legitimate        = 0
-        Excluded          = 0
-        ExcludedOU        = [System.Collections.Generic.List[string]]::new()
-        WillFix           = 0
-        WillFixPerDomain  = $null
+        TotalOU          = 0
+        UnlinkGPO        = 0
+        UnlinkGPOEmpty   = 0
+        DeleteOU         = 0
+        Legitimate       = 0
+        Excluded         = 0
+        ExcludedOU       = [System.Collections.Generic.List[string]]::new()
+        WillFix          = 0
+        WillFixPerDomain = $null
     }
     Overview       = {
 
@@ -69,8 +69,8 @@
         New-HTMLText -FontSize 10pt -Text "Following can happen: " -FontWeight bold
         New-HTMLList -Type Unordered {
             New-HTMLListItem -Text 'Organizational Units that can have Group Policies unlinked (objects exists): ', $Script:Reporting['GPOOrganizationalUnit']['Variables']['UnlinkGPO'] -FontWeight normal, bold
-            New-HTMLListItem -Text 'Organizational Units that can have Group Policies unlinked and OU removed (be careful!) (no objects): ', $Script:Reporting['GPOOrganizationalUnit']['Variables']['UnlinkGPODeleteOU'] -FontWeight normal, bold
-            New-HTMLListItem -Text "Organizational Units that can be deleted (no objects/no gpos): ", $Script:Reporting['GPOOrganizationalUnit']['Variables']['DeleteOU'] -FontWeight normal, bold
+            New-HTMLListItem -Text 'Organizational Units that can have Group Policies unlinked (no applicable objects): ', $Script:Reporting['GPOOrganizationalUnit']['Variables']['UnlinkGPOEmpty'] -FontWeight normal, bold
+            New-HTMLListItem -Text "Organizational Units that can be deleted (no objects/no gpos) - ", "optional", ": ", $Script:Reporting['GPOOrganizationalUnit']['Variables']['DeleteOU'] -FontWeight normal, bold, normal, bold -Color None, red, None, None
         } -FontSize 10pt
         New-HTMLText -Text 'Following domains require actions (permissions required):' -FontSize 10pt -FontWeight bold
         New-HTMLList -Type Unordered {
@@ -99,6 +99,22 @@
             "Please make sure that you really want to unlink GPO or delete Organizational Unit before executing changes. Sometimes it's completly valid to keep one or the other. "
             "Unlinking GPO from OU that has no Computer or User objects is fairly safe exercise. Removing OU requires a bit more dive in, and should only be executed if you know what you're doing. "
         ) -FontWeight normal, bold -Color None, Red -FontSize 10pt
+
+        if ($Script:Reporting['GPOOrganizationalUnit']['Exclusions']) {
+            New-HTMLText -LineBreak
+            New-HTMLText -Text @(
+                "While preparing this report following exclusions were defined. "
+                "Please make sure that when you execute your steps to include those exclusions to prevent any issues. "
+            ) -FontSize 10pt -FontWeight bold, normal -Color Red, None -LineBreak
+
+            New-HTMLText -Text "Code to use for exclusions: " -FontSize 10pt -FontWeight bold -LineBreak
+
+            $Code = New-GPOZaurrExclusions -ExclusionsArray $Script:Reporting['GPOOrganizationalUnit']['Exclusions']
+
+            if ($Code) {
+                New-HTMLCodeBlock -Code $Code -Style powershell
+            }
+        }
     }
     Solution       = {
         New-HTMLSection -Invisible {
@@ -110,7 +126,7 @@
                     New-ChartBarOptions -Type bar -Distributed
                     New-ChartAxisY -LabelMaxWidth 200 -LabelAlign left -Show
                     New-ChartBar -Name "Unlink GPO ($($Script:Reporting['GPOOrganizationalUnit']['Variables']['UnlinkGPO']))" -Value $Script:Reporting['GPOOrganizationalUnit']['Variables']['UnlinkGPO']
-                    New-ChartBar -Name "Unlink GPO Delete OU ($($Script:Reporting['GPOOrganizationalUnit']['Variables']['UnlinkGPODeleteOU']))" -Value $Script:Reporting['GPOOrganizationalUnit']['Variables']['UnlinkGPODeleteOU']
+                    New-ChartBar -Name "Unlink GPO Delete OU ($($Script:Reporting['GPOOrganizationalUnit']['Variables']['UnlinkGPOEmpty']))" -Value $Script:Reporting['GPOOrganizationalUnit']['Variables']['UnlinkGPOEmpty']
                     New-ChartBar -Name "Delete OU ($($Script:Reporting['GPOOrganizationalUnit']['Variables']['DeleteOU']))" -Value $Script:Reporting['GPOOrganizationalUnit']['Variables']['DeleteOU']
                 } -Title 'Organizational Units' -TitleAlignment center
             }

Private/Invoke.GPOZaurrOwners.ps1

@@ -140,6 +140,22 @@
                 New-HTMLListItem -Text "$Domain requires ", $Script:Reporting['GPOOwners']['Variables']['RequiresDiffFixPerDomain'][$Domain], " changes." -FontWeight normal, bold, normal
             }
         } -FontSize 10pt
+
+        if ($Script:Reporting['GPOOwners']['Exclusions']) {
+            New-HTMLText -LineBreak
+            New-HTMLText -Text @(
+                "While preparing this report following exclusions were defined. "
+                "Please make sure that when you execute your steps to include those exclusions to prevent any issues. "
+            ) -FontSize 10pt -FontWeight bold, normal -Color Red, None -LineBreak
+
+            New-HTMLText -Text "Code to use for exclusions: " -FontSize 10pt -FontWeight bold -LineBreak
+
+            $Code = New-GPOZaurrExclusions -ExclusionsArray $Script:Reporting['GPOOwners']['Exclusions']
+
+            if ($Code) {
+                New-HTMLCodeBlock -Code $Code -Style powershell
+            }
+        }
     }
     Solution       = {
         New-HTMLSection -Invisible {

README.md

@@ -55,6 +55,20 @@ To understand the usage I've created blog post you may find useful
 
 ## Changelog
 
+- 0.0.137 - 2021.08.17
+  - ☑ Improved `Invoke-GPOZaurr` - type `GPOOrganizationalUnit` - moving delete of OU as non-mandatory option
+- 0.0.136 - 2021.08.17
+  - ☑ Improved wording
+- 0.0.135 - 2021.08.17
+  - ☑ Improved exclusions
+- 0.0.134 - 2021.08.16
+  - ☑ Improved exclusions for email use
+- 0.0.133 - 2021.08.16
+  - ☑ Improved exclusions for email use
+- 0.0.132 - 2021.08.16
+  - ☑ Improved exclusions for email use
+- 0.0.131 - 2021.08.16
+  - ☑ Improved exclusions for email use
 - 0.0.130 - 2021.08.13
   - 💡 Updated HTML to new version of `PSWriteHTML` that fixes complains about `SearchBuilder` option
   - ☑ Improved `Invoke-GPOZaurr` - type `GPOOrganizationalUnit` with exclusions