bump version

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.133'
+    ModuleVersion        = '0.0.136'
     PowerShellVersion    = '5.1'
     PrivateData          = @{
         PSData = @{

Private/Invoke.GPOZaurrBlockedInheritance.ps1

@@ -116,9 +116,9 @@
             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
+            ) -FontSize 10pt -FontWeight bold, normal -Color Red, None -LineBreak
 
-            New-HTMLText -Text "Code to use: " -FontSize 10pt -FontWeight bold
+            New-HTMLText -Text "Code to use for exclusions: " -FontSize 10pt -FontWeight bold -LineBreak
 
             $Code = New-GPOZaurrExclusions -ExclusionsArray $Script:Reporting['GPOBlockedInheritance']['Exclusions']
 

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
@@ -304,9 +319,9 @@
             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
+            ) -FontSize 10pt -FontWeight bold, normal -Color Red, None -LineBreak
 
-            New-HTMLText -Text "Code to use: " -FontSize 10pt -FontWeight bold
+            New-HTMLText -Text "Code to use for exclusions: " -FontSize 10pt -FontWeight bold -LineBreak
 
             $Code = New-GPOZaurrExclusions -ExclusionsArray $Script:Reporting['GPOList']['Exclusions']
 

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') {
@@ -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,7 +69,7 @@
         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 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): ", $Script:Reporting['GPOOrganizationalUnit']['Variables']['DeleteOU'] -FontWeight normal, bold
         } -FontSize 10pt
         New-HTMLText -Text 'Following domains require actions (permissions required):' -FontSize 10pt -FontWeight bold
@@ -105,9 +105,9 @@
             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
+            ) -FontSize 10pt -FontWeight bold, normal -Color Red, None -LineBreak
 
-            New-HTMLText -Text "Code to use: " -FontSize 10pt -FontWeight bold
+            New-HTMLText -Text "Code to use for exclusions: " -FontSize 10pt -FontWeight bold -LineBreak
 
             $Code = New-GPOZaurrExclusions -ExclusionsArray $Script:Reporting['GPOOrganizationalUnit']['Exclusions']
 
@@ -126,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

@@ -146,9 +146,9 @@
             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
+            ) -FontSize 10pt -FontWeight bold, normal -Color Red, None -LineBreak
 
-            New-HTMLText -Text "Code to use: " -FontSize 10pt -FontWeight bold
+            New-HTMLText -Text "Code to use for exclusions: " -FontSize 10pt -FontWeight bold -LineBreak
 
             $Code = New-GPOZaurrExclusions -ExclusionsArray $Script:Reporting['GPOOwners']['Exclusions']
 

README.md

@@ -55,6 +55,12 @@ To understand the usage I've created blog post you may find useful
 
 ## Changelog
 
+- 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