Color adjustment

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-GPOZaurrDictionary', 'Get-GPOZaurrDuplicateObject', 'Get-GPOZaurrFiles', 'Get-GPOZaurrFilesPolicyDefinition', 'Get-GPOZaurrFolders', 'Get-GPOZaurrInheritance', 'Get-GPOZaurrLegacyFiles', 'Get-GPOZaurrLink', 'Get-GPOZaurrLinkSummary', 'Get-GPOZaurrNetLogon', 'Get-GPOZaurrOwner', 'Get-GPOZaurrPassword', 'Get-GPOZaurrPermission', '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-GPOZaurrPermission', 'Remove-GPOZaurrWMI', 'Repair-GPOZaurrNetLogonOwner', 'Repair-GPOZaurrPermissionConsistency', 'Restore-GPOZaurr', 'Save-GPOZaurrFiles', 'Set-GPOOwner', 'Set-GPOZaurrOwner', 'Set-GPOZaurrStatus', 'Skip-GroupPolicy')
     GUID                 = 'f7d4c9e4-0298-4f51-ad77-e8e3febebbde'
-    ModuleVersion        = '0.0.96'
+    ModuleVersion        = '0.0.98'
     PowerShellVersion    = '5.1'
     PrivateData          = @{
         PSData = @{
@@ -18,7 +18,7 @@
         }
     }
     RequiredModules      = @(@{
-            ModuleVersion = '0.0.189'
+            ModuleVersion = '0.0.190'
             ModuleName    = 'PSSharedGoods'
             Guid          = 'ee272aa8-baaa-4edf-9f45-b6d6f7d844fe'
         }, @{

Private/ConvertFrom-XMLRSOP.ps1

@@ -3,14 +3,14 @@
     param(
         [System.Xml.XmlElement]$Content,
         [string] $ResultsType,
-        [Microsoft.GroupPolicy.GPRsop] $ResultantSetPolicy,
+       # [Microsoft.GroupPolicy.GPRsop] $ResultantSetPolicy,
         [string] $Splitter = [System.Environment]::NewLine
     )
     $GPOPrimary = [ordered] @{
         Summary              = $null
         SummaryDetails       = [System.Collections.Generic.List[PSCustomObject]]::new()
         SummaryDownload      = $null
-        ResultantSetPolicy   = $ResultantSetPolicy
+        #ResultantSetPolicy   = $ResultantSetPolicy
 
         GroupPolicies        = $null
         GroupPoliciesLinks   = $null

Private/Get-XMLGPO.ps1

@@ -222,6 +222,7 @@
             'Enabled'                           = $EnabledBool
             'Optimized'                         = $Optimized
             'Problem'                           = $Problem
+            'ApplyPermission'                   = $null
             'Exclude'                           = $Exclude
             'ComputerPolicies'                  = $XMLContent.GPO.Computer.ExtensionData.Name -join ", "
             'UserPolicies'                      = $XMLContent.GPO.User.ExtensionData.Name -join ", "
@@ -297,6 +298,15 @@
             }
             'GPOObject'                         = $GPO
         }
+        if ($GPOOutput.ACL) {
+            $GPOOutput.ApplyPermission = $false
+            foreach ($Permission in $GPOOutput.ACL) {
+                if ($Permission.Permissions -eq 'Apply Group Policy') {
+                    $GPOOutput.ApplyPermission = $true
+                }
+            }
+        }
+
     }
     if ($PermissionsOnly -or $OwnerOnly) {
         $GPOOutput
@@ -319,6 +329,11 @@
                     $GPOOutput
                 }
             }
+            if ($Type -contains 'NoApplyPermission') {
+                if ($GPOOutput.ApplyPermission -eq $false) {
+                    $GPOOutput
+                }
+            }
         }
     }
 }

Private/Invoke.GPOZaurrList.ps1

@@ -19,6 +19,8 @@
         $Script:Reporting['GPOList']['Variables']['GPOOptimizedPerDomain'] = @{}
         $Script:Reporting['GPOList']['Variables']['GPOProblemPerDomain'] = @{}
         $Script:Reporting['GPOList']['Variables']['GPONoProblemPerDomain'] = @{}
+        $Script:Reporting['GPOList']['Variables']['GPOApplyPermissionYesPerDomain'] = @{}
+        $Script:Reporting['GPOList']['Variables']['GPOApplypermissionNoPerDomain'] = @{}
         foreach ($GPO in $Script:Reporting['GPOList']['Data']) {
             # Create Per Domain Variables
             if (-not $Script:Reporting['GPOList']['Variables']['GPONotValidPerDomain'][$GPO.DomainName]) {
@@ -39,7 +41,13 @@
             if (-not $Script:Reporting['GPOList']['Variables']['GPONoProblemPerDomain'][$GPO.DomainName]) {
                 $Script:Reporting['GPOList']['Variables']['GPONoProblemPerDomain'][$GPO.DomainName] = 0
             }
-            if ($GPO.Enabled -eq $false -or $GPO.Empty -eq $true -or $GPO.Linked -eq $false) {
+            if (-not $Script:Reporting['GPOList']['Variables']['GPOApplyPermissionYesPerDomain'][$GPO.DomainName]) {
+                $Script:Reporting['GPOList']['Variables']['GPOApplyPermissionYesPerDomain'][$GPO.DomainName] = 0
+            }
+            if (-not $Script:Reporting['GPOList']['Variables']['GPOApplypermissionNoPerDomain'][$GPO.DomainName]) {
+                $Script:Reporting['GPOList']['Variables']['GPOApplypermissionNoPerDomain'][$GPO.DomainName] = 0
+            }
+            if ($GPO.Enabled -eq $false -or $GPO.Empty -eq $true -or $GPO.Linked -eq $false -or $GPO.ApplyPermission -eq $false) {
                 $Script:Reporting['GPOList']['Variables']['GPONotValid']++
                 $Script:Reporting['GPOList']['Variables']['GPONotValidPerDomain'][$GPO.DomainName]++
             } else {
@@ -78,6 +86,11 @@
             } else {
                 $Script:Reporting['GPOList']['Variables']['GPODisabled']++
             }
+            if ($GPO.ApplyPermission -eq $true) {
+                $Script:Reporting['GPOList']['Variables']['ApplyPermissionYes']++
+            } else {
+                $Script:Reporting['GPOList']['Variables']['ApplyPermissionNo']++
+            }
             if ($GPO.LinksDisabledCount -eq $GPO.LinksCount -and $GPO.LinksCount -gt 0) {
                 $Script:Reporting['GPOList']['Variables']['GPOLinkedButLinkDisabled']++
             }
@@ -127,38 +140,42 @@
         }
     }
     Variables  = @{
-        GPONotValidPerDomain     = $null
-        GPOValidPerDomain        = $null
-        GPONotOptimizedPerDomain = $null
-        GPOOptimizedPerDomain    = $null
-        GPOProblemPerDomain      = $null
-        GPONoProblemPerDomain    = $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
-        GPOValid                 = 0
-        GPONotValid              = 0
-        GPOLinkedButLinkDisabled = 0
-        GPOTotal                 = 0
+        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
+        GPOValid                       = 0
+        GPONotValid                    = 0
+        GPOLinkedButLinkDisabled       = 0
+        GPOTotal                       = 0
+        ApplyPermissionYes             = 0
+        ApplyPermissionNo              = 0
     }
     Overview   = {
 
@@ -167,7 +184,8 @@
         New-HTMLText -TextBlock {
             "Over time Administrators add more and more group policies, as business requirements change. "
             "Due to neglection or thinking it may serve it's purpose later on a lot of Group Policies often have no value at all. "
-            "Either the Group Policy is not linked to anything and just stays unlinked forever, or GPO is linked, but the link (links) are disabled. "
+            "Either the Group Policy is not linked to anything and just stays unlinked forever, or GPO is linked, but the link (links) are disabled or GPO is totally disabled. "
+            "Then there are Group Policies that are targetting certain group or person and that group is removed leaving Group Policy doing nothing. "
             "Additionally sometimes new GPO is created without any settings or the settings are removed over time, but GPO stays in place. "
         } -FontSize 10pt
         New-HTMLList -Type Unordered {
@@ -180,6 +198,7 @@
                     New-HTMLListItem -Text "Group Policies that are linked, but empty: ", $Script:Reporting['GPOList']['Variables']['GPOLinkedButEmpty'] -FontWeight normal, bold
                     New-HTMLListItem -Text "Group Policies that are linked, but link disabled: ", $Script:Reporting['GPOList']['Variables']['GPOLinkedButLinkDisabled'] -FontWeight normal, bold
                     New-HTMLListItem -Text "Group Policies that are disabled (both user/computer sections): ", $Script:Reporting['GPOList']['Variables']['GPODisabled'] -FontWeight normal, bold
+                    New-HTMLListItem -Text "Group Policies that have no Apply Permission: ", $Script:Reporting['GPOList']['Variables']['ApplyPermissionNo'] -FontWeight normal, bold
                 }
             }
         } -FontSize 10pt
@@ -270,6 +289,7 @@
                     New-ChartBar -Name 'Linked' -Value $Script:Reporting['GPOList']['Variables']['GPOLinked'], $Script:Reporting['GPOList']['Variables']['GPONotLinked']
                     New-ChartBar -Name 'Not Empty' -Value $Script:Reporting['GPOList']['Variables']['GPONotEmpty'], $Script:Reporting['GPOList']['Variables']['GPOEmpty']
                     New-ChartBar -Name 'Enabled' -Value $Script:Reporting['GPOList']['Variables']['GPOEnabled'], $Script:Reporting['GPOList']['Variables']['GPODisabled']
+                    New-ChartBar -Name 'Apply Permission' -Value $Script:Reporting['GPOList']['Variables']['ApplyPermissionYes'], $Script:Reporting['GPOList']['Variables']['ApplyPermissionNo']
                     New-ChartBar -Name 'Valid' -Value $Script:Reporting['GPOList']['Variables']['GPOValid'], $Script:Reporting['GPOList']['Variables']['GPONotValid']
                     New-ChartBar -Name 'Optimized (for speed)' -Value $Script:Reporting['GPOList']['Variables']['GPOOptimized'], $Script:Reporting['GPOList']['Variables']['GPONotOptimized']
                     New-ChartBar -Name 'No problem' -Value $Script:Reporting['GPOList']['Variables']['GPONoProblem'], $Script:Reporting['GPOList']['Variables']['GPOProblem']
@@ -289,6 +309,7 @@
                     New-HTMLListItem -FontWeight bold, normal -Text "Enabled", " - means GPO has at least one section enabled. If enabled is set to false that means both sections are disabled, and therefore GPO is not active. "
                     New-HTMLListItem -FontWeight bold, normal -Text "Optimized", " - means GPO section that is not in use is disabled. If section (user or computer) is enabled and there is no content, it's not optimized. "
                     New-HTMLListItem -FontWeight bold, normal -Text "Problem", " - means GPO has one or more section (user or computer) that is disabled, yet there is content in it. "
+                    New-HTMLListItem -FontWeight bold, normal -Text "ApplyPermission", " - means GPO has no Apply Permission. This means there's no user/computer/group it's applicable to. "
                 } -FontSize 10pt
                 New-HTMLTable -DataTable $Script:Reporting['GPOList']['Data'] -Filtering {
                     New-HTMLTableCondition -Name 'Exclude' -Value $true -BackgroundColor DeepSkyBlue -ComparisonType string -Row
@@ -298,6 +319,7 @@
                     New-HTMLTableCondition -Name 'Enabled' -Value $false -BackgroundColor Salmon -ComparisonType string
                     New-HTMLTableCondition -Name 'Optimized' -Value $false -BackgroundColor Salmon -ComparisonType string
                     New-HTMLTableCondition -Name 'Problem' -Value $true -BackgroundColor Salmon -ComparisonType string
+                    New-HTMLTableCondition -Name 'ApplyPermission' -Value $false -BackgroundColor Salmon -ComparisonType string
                     New-HTMLTableCondition -Name 'ComputerProblem' -Value $true -BackgroundColor Salmon -ComparisonType string
                     New-HTMLTableCondition -Name 'UserProblem' -Value $true -BackgroundColor Salmon -ComparisonType string
                     New-HTMLTableCondition -Name 'ComputerOptimized' -Value $false -BackgroundColor Salmon -ComparisonType string
@@ -308,6 +330,7 @@
                     New-HTMLTableCondition -Name 'Enabled' -Value $true -BackgroundColor SpringGreen -ComparisonType string
                     New-HTMLTableCondition -Name 'Optimized' -Value $true -BackgroundColor SpringGreen -ComparisonType string
                     New-HTMLTableCondition -Name 'Problem' -Value $false -BackgroundColor SpringGreen -ComparisonType string
+                    New-HTMLTableCondition -Name 'ApplyPermission' -Value $true -BackgroundColor SpringGreen -ComparisonType string
                     New-HTMLTableCondition -Name 'ComputerProblem' -Value $false -BackgroundColor SpringGreen -ComparisonType string
                     New-HTMLTableCondition -Name 'UserProblem' -Value $false -BackgroundColor SpringGreen -ComparisonType string
                     New-HTMLTableCondition -Name 'ComputerOptimized' -Value $true -BackgroundColor SpringGreen -ComparisonType string
@@ -373,7 +396,7 @@
                                         Skip-GroupPolicy -Name 'TEST | Drive Mapping'
                                         Skip-GroupPolicy -Name 'Default Domain Policy'
                                         Skip-GroupPolicy -Name 'Default Domain Controllers Policy' -DomaiName 'JustOneDomain'
-                                    }
+                                    } -WhatIf
                                 }
                                 New-HTMLText -Text @(
                                     "Code above when executed will scan YourDomainYouHavePermissionsFor, find all empty, unlinked, disabled group policies, backup any GPO just before it's to be deleted to `$Env:UserProfile\Desktop\GPO. "
@@ -382,11 +405,48 @@
                                     "Now go ahead and find what's there"
                                 )
                             }
-                            New-HTMLWizardStep -Name 'Remove GPOs that are EMPTY or UNLINKED' {
+                            New-HTMLWizardStep -Name 'Remove GPOs that are EMPTY' {
                                 New-HTMLText -Text @(
                                     "Following command when executed removes every ",
                                     "EMPTY"
-                                    " or "
+                                    " Group Policy. Make sure when running it for the first time to run it with ",
+                                    "WhatIf",
+                                    " parameter as shown below to prevent accidental removal.",
+                                    "Make sure to use BackupPath which will make sure that for each GPO that is about to be deleted a backup is made to folder on a desktop."
+                                    "You can skip parameters related to backup if you did backup all GPOs prior to running remove command. "
+                                ) -FontWeight normal, bold, normal, bold, normal, bold, normal, normal -Color Black, Red, Black, Red, Black
+                                New-HTMLCodeBlock -Code {
+                                    Remove-GPOZaurr -Type Empty -BackupPath "$Env:UserProfile\Desktop\GPO" -Verbose -WhatIf
+                                }
+                                New-HTMLText -TextBlock {
+                                    "Alternatively for multi-domain scenario, if you have limited Domain Admin credentials to a single domain please use following command: "
+                                }
+                                New-HTMLCodeBlock -Code {
+                                    Remove-GPOZaurr -Type Empty -BackupPath "$Env:UserProfile\Desktop\GPO" -Verbose -WhatIf -IncludeDomains 'YourDomainYouHavePermissionsFor'
+                                }
+                                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 deleted matches expected data. "
+                                } -LineBreak
+                                New-HTMLText -Text "Once happy with results please follow with command (this will start fixing process): " -LineBreak -FontWeight bold
+                                New-HTMLCodeBlock -Code {
+                                    Remove-GPOZaurr -Type Empty -BackupPath "$Env:UserProfile\Desktop\GPO" -LimitProcessing 2 -Verbose
+                                }
+                                New-HTMLText -TextBlock {
+                                    "Alternatively for multi-domain scenario, if you have limited Domain Admin credentials to a single domain please use following command: "
+                                }
+                                New-HTMLCodeBlock -Code {
+                                    Remove-GPOZaurr -Type Empty -BackupPath "$Env:UserProfile\Desktop\GPO" -LimitProcessing 2 -Verbose -IncludeDomains 'YourDomainYouHavePermissionsFor'
+                                }
+                                New-HTMLText -TextBlock {
+                                    "This command when executed deletes only first X empty GPOs. Use LimitProcessing parameter to prevent mass delete 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."
+                                    "Please make sure to check if backup is made as well before going all in."
+                                }
+                                New-HTMLText -Text "If there's nothing else to be deleted, we can skip to next step step"
+                            }
+                            New-HTMLWizardStep -Name 'Remove GPOs that are UNLINKED' {
+                                New-HTMLText -Text @(
+                                    "Following command when executed removes every ",
                                     "NOT LINKED"
                                     " Group Policy. Make sure when running it for the first time to run it with ",
                                     "WhatIf",
@@ -395,33 +455,33 @@
                                     "You can skip parameters related to backup if you did backup all GPOs prior to running remove command. "
                                 ) -FontWeight normal, bold, normal, bold, normal, bold, normal, normal -Color Black, Red, Black, Red, Black
                                 New-HTMLCodeBlock -Code {
-                                    Remove-GPOZaurr -Type Empty, Unlinked -BackupPath "$Env:UserProfile\Desktop\GPO" -Verbose -WhatIf
+                                    Remove-GPOZaurr -Type Unlinked -BackupPath "$Env:UserProfile\Desktop\GPO" -Verbose -WhatIf
                                 }
                                 New-HTMLText -TextBlock {
                                     "Alternatively for multi-domain scenario, if you have limited Domain Admin credentials to a single domain please use following command: "
                                 }
                                 New-HTMLCodeBlock -Code {
-                                    Remove-GPOZaurr -Type Empty, Unlinked -BackupPath "$Env:UserProfile\Desktop\GPO" -Verbose -WhatIf -IncludeDomains 'YourDomainYouHavePermissionsFor'
+                                    Remove-GPOZaurr -Type Unlinked -BackupPath "$Env:UserProfile\Desktop\GPO" -Verbose -WhatIf -IncludeDomains 'YourDomainYouHavePermissionsFor'
                                 }
                                 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 deleted matches expected data. "
                                 } -LineBreak
                                 New-HTMLText -Text "Once happy with results please follow with command (this will start fixing process): " -LineBreak -FontWeight bold
                                 New-HTMLCodeBlock -Code {
-                                    Remove-GPOZaurr -Type Empty, Unlinked -BackupPath "$Env:UserProfile\Desktop\GPO" -LimitProcessing 2 -Verbose
+                                    Remove-GPOZaurr -Type Unlinked -BackupPath "$Env:UserProfile\Desktop\GPO" -LimitProcessing 2 -Verbose
                                 }
                                 New-HTMLText -TextBlock {
                                     "Alternatively for multi-domain scenario, if you have limited Domain Admin credentials to a single domain please use following command: "
                                 }
                                 New-HTMLCodeBlock -Code {
-                                    Remove-GPOZaurr -Type Empty, Unlinked -BackupPath "$Env:UserProfile\Desktop\GPO" -LimitProcessing 2 -Verbose -IncludeDomains 'YourDomainYouHavePermissionsFor'
+                                    Remove-GPOZaurr -Type Unlinked -BackupPath "$Env:UserProfile\Desktop\GPO" -LimitProcessing 2 -Verbose -IncludeDomains 'YourDomainYouHavePermissionsFor'
                                 }
                                 New-HTMLText -TextBlock {
-                                    "This command when executed deletes only first X empty or unlinked GPOs. Use LimitProcessing parameter to prevent mass delete and increase the counter when no errors occur."
+                                    "This command when executed deletes only first X unlinked GPOs. Use LimitProcessing parameter to prevent mass delete 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."
                                     "Please make sure to check if backup is made as well before going all in."
                                 }
-                                New-HTMLText -Text "If there's nothing else to be deleted on SYSVOL side, we can skip to next step step"
+                                New-HTMLText -Text "If there's nothing else to be deleted, we can skip to next step step"
                             }
                             New-HTMLWizardStep -Name 'Remove GPOs that are DISABLED' {
                                 New-HTMLText -Text @(
@@ -465,6 +525,48 @@
                                 }
                                 New-HTMLText -Text "If there's nothing else to be deleted, we can skip to next step step."
                             }
+                            New-HTMLWizardStep -Name 'Remove GPOs that do not APPLY' {
+                                New-HTMLText -Text @(
+                                    "Following command when executed removes every ",
+                                    "NoApplyPermission"
+                                    " Group Policy. Make sure when running it for the first time to run it with ",
+                                    "WhatIf",
+                                    " parameter as shown below to prevent accidental removal.",
+                                    "Make sure to use BackupPath which will make sure that for each GPO that is about to be deleted a backup is made to folder on a desktop."
+                                    "You can skip parameters related to backup if you did backup all GPOs prior to running remove command. "
+                                ) -FontWeight normal, bold, normal, bold, normal, bold, normal, normal -Color Black, Red, Black, Red, Black
+                                New-HTMLText -TextBlock {
+                                    ""
+                                }
+                                New-HTMLCodeBlock -Code {
+                                    Remove-GPOZaurr -Type NoApplyPermission -BackupPath "$Env:UserProfile\Desktop\GPO" -Verbose -WhatIf
+                                }
+                                New-HTMLText -TextBlock {
+                                    "Alternatively for multi-domain scenario, if you have limited Domain Admin credentials to a single domain please use following command: "
+                                }
+                                New-HTMLCodeBlock -Code {
+                                    Remove-GPOZaurr -Type NoApplyPermission -BackupPath "$Env:UserProfile\Desktop\GPO" -Verbose -WhatIf -IncludeDomains 'YourDomainYouHavePermissionsFor'
+                                }
+                                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 deleted matches expected data. "
+                                } -LineBreak
+                                New-HTMLText -Text "Once happy with results please follow with command (this will start fixing process): " -LineBreak -FontWeight bold
+                                New-HTMLCodeBlock -Code {
+                                    Remove-GPOZaurr -Type NoApplyPermission -BackupPath "$Env:UserProfile\Desktop\GPO" -LimitProcessing 2 -Verbose
+                                }
+                                New-HTMLText -TextBlock {
+                                    "Alternatively for multi-domain scenario, if you have limited Domain Admin credentials to a single domain please use following command: "
+                                }
+                                New-HTMLCodeBlock -Code {
+                                    Remove-GPOZaurr -Type NoApplyPermission -BackupPath "$Env:UserProfile\Desktop\GPO" -LimitProcessing 2 -Verbose -IncludeDomains 'YourDomainYouHavePermissionsFor'
+                                }
+                                New-HTMLText -TextBlock {
+                                    "This command when executed deletes only first X NoApplyPermission GPOs. Use LimitProcessing parameter to prevent mass delete 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. "
+                                    "Please make sure to check if backup is made as well before going all in."
+                                }
+                                New-HTMLText -Text "If there's nothing else to be deleted, we can skip to next step step."
+                            }
                             New-HTMLWizardStep -Name 'Optimize GPOs (optional)' {
                                 New-HTMLText -Text @(
                                     "Following command when executed disables user or computer section when there's no content for given type. ",

Private/Invoke.GPOZaurrNetLogonOwners.ps1

@@ -123,8 +123,8 @@
             }
             New-HTMLPanel {
                 New-HTMLChart {
-                    New-ChartPie -Name 'Correct Owners' -Value $Script:Reporting['NetLogonOwners']['Variables']['NetLogonOwnersAdministrators'] -Color LightGreen
-                    New-ChartPie -Name 'Incorrect Owners' -Value $Script:Reporting['NetLogonOwners']['Variables']['NetLogonOwnersToFix'] -Color Crimson
+                    New-ChartPie -Name 'Correct Owners' -Value $Script:Reporting['NetLogonOwners']['Variables']['NetLogonOwnersAdministrators'] -Color SpringGreen
+                    New-ChartPie -Name 'Incorrect Owners' -Value $Script:Reporting['NetLogonOwners']['Variables']['NetLogonOwnersToFix'] -Color Salmon
                 } -Title 'NetLogon Owners' -TitleAlignment center
             }
         }

Private/Invoke.GPOZaurrPermissionsAdministrative.ps1

@@ -82,7 +82,7 @@
             New-HTMLPanel {
                 New-HTMLChart {
                     New-ChartBarOptions -Type barStacked
-                    New-ChartLegend -Name 'Yes', 'No' -Color LightGreen, Salmon
+                    New-ChartLegend -Name 'Yes', 'No' -Color SpringGreen, Salmon
                     New-ChartBar -Name 'Administrative Users Present' -Value $Script:Reporting['GPOPermissionsAdministrative']['Variables']['WillNotTouch'], $Script:Reporting['GPOPermissionsAdministrative']['Variables']['WillFix']
                     #New-ChartBar -Name 'Accessible Group Policies' -Value $Script:Reporting['GPOPermissionsAdministrative']['Variables']['Read'], $Script:Reporting['GPOPermissionsAdministrative']['Variables']['CouldNotRead']
                 } -Title 'Group Policy Permissions' -TitleAlignment center

Private/Invoke.GPOZaurrPermissionsRead.ps1

@@ -142,7 +142,7 @@
             New-HTMLPanel {
                 New-HTMLChart {
                     New-ChartBarOptions -Type barStacked
-                    New-ChartLegend -Name 'Yes', 'No' -Color LightGreen, Salmon
+                    New-ChartLegend -Name 'Yes', 'No' -Color SpringGreen, Salmon
                     New-ChartBar -Name 'Authenticated Users Available' -Value $Script:Reporting['GPOPermissionsRead']['Variables']['WillNotTouch'], $Script:Reporting['GPOPermissionsRead']['Variables']['WillFix']
                     New-ChartBar -Name 'Accessible Group Policies' -Value $Script:Reporting['GPOPermissionsRead']['Variables']['Read'], $Script:Reporting['GPOPermissionsRead']['Variables']['CouldNotRead']
                 } -Title 'Group Policy Permissions' -TitleAlignment center

Private/New-GPOZaurrReportConsole.ps1

@@ -1,7 +1,8 @@
 function New-GPOZaurrReportConsole {
     [cmdletBinding()]
     param(
-        [System.Collections.IDictionary] $Results
+        [System.Collections.IDictionary] $Results,
+        [string] $ComputerName
     )
     Begin {
         $GPODeny = @{
@@ -20,26 +21,40 @@
         $UserWhereApplied = ($Results.UserResults.GroupPolicies | Sort-Object -Property Name).Where( { $_.Status -eq 'Applied' }, 'split')
     }
     Process {
-        Write-Color -Text 'Computer Settings' -Color White -LinesBefore 1
-        Write-Color -Text '[>] Last time Group Policy was applied: ', $Results.ComputerResults.Summary.ReadTime @WriteSummary
-        Write-Color -Text '[>] Computer Name: ', $Results.ComputerResults.Summary.ComputerName @WriteSummary
-        Write-Color -Text '[>] Domain Name: ', $Results.ComputerResults.Summary.DomainName @WriteSummary
-        Write-Color -Text '[>] Organizational Unit: ', $Results.ComputerResults.Summary.OrganizationalUnit @WriteSummary
-        Write-Color -Text '[>] Site: ', $Results.ComputerResults.Summary.Site @WriteSummary
-        Write-Color -Text '[>] GPO Types: ', ($Results.ComputerResults.Summary.GPOTypes -replace [System.Environment]::NewLine, ', ') @WriteSummary
-        Write-Color -Text '[>] Slow link: ', ($Results.ComputerResults.Summary.SlowLink) @WriteSummary
+        if ($Results.ComputerResults) {
+            Write-Color -Text 'Computer Settings' -Color Yellow -LinesBefore 1
+            Write-Color -Text '[>] Last time Group Policy was applied: ', $Results.ComputerResults.Summary.ReadTime @WriteSummary
+            Write-Color -Text '[>] Computer Name: ', $Results.ComputerResults.Summary.ComputerName @WriteSummary
+            Write-Color -Text '[>] Domain Name: ', $Results.ComputerResults.Summary.DomainName @WriteSummary
+            Write-Color -Text '[>] Organizational Unit: ', $Results.ComputerResults.Summary.OrganizationalUnit @WriteSummary
+            Write-Color -Text '[>] Site: ', $Results.ComputerResults.Summary.Site @WriteSummary
+            Write-Color -Text '[>] GPO Types: ', ($Results.ComputerResults.Summary.GPOTypes -replace [System.Environment]::NewLine, ', ') @WriteSummary
+            Write-Color -Text '[>] Slow link: ', ($Results.ComputerResults.Summary.SlowLink) @WriteSummary
 
-        Write-Color -Text 'Applied Group Policy Objects' -StartSpaces 3 -LinesBefore 1
-        foreach ($GPO in $ComputerWhereApplied[0]) {
-            Write-Color -Text '[+] [', $GPO.DomainName, '] ', $GPO.Name @GPOSuccess
-        }
+            Write-Color -Text 'Applied Group Policy Objects' -StartSpaces 3 -LinesBefore 1
+            foreach ($GPO in $ComputerWhereApplied[0]) {
+                Write-Color -Text '[+] [', $GPO.DomainName, '] ', $GPO.Name @GPOSuccess
+            }
 
-        Write-Color -Text 'Denied Group Policy Objects' -StartSpaces 3
-        foreach ($GPO in $ComputerWhereApplied[1]) {
-            Write-Color -Text '[-] [', $GPO.DomainName, '] ', $GPO.Name @GPODeny
+            Write-Color -Text 'Denied Group Policy Objects' -StartSpaces 3
+            foreach ($GPO in $ComputerWhereApplied[1]) {
+                Write-Color -Text '[-] [', $GPO.DomainName, '] ', $GPO.Name @GPODeny
+            }
+        } else {
+            Write-Color -Text 'Computer Settings' -Color Yellow -LinesBefore 1
+            Write-Color -Text '[>] Last time Group Policy was applied: ', 'Unable to get? No administrative permission?' @WriteSummary
+            Write-Color -Text '[>] Computer Name: ', $ComputerName @WriteSummary
         }
 
         Write-Color -Text 'User Settings' -Color Yellow -LinesBefore 1
+        Write-Color -Text '[>] Last time Group Policy was applied: ', $Results.UserResults.Summary.ReadTime @WriteSummary
+        Write-Color -Text '[>] Computer Name: ', $Results.UserResults.Summary.ComputerName @WriteSummary
+        Write-Color -Text '[>] Domain Name: ', $Results.UserResults.Summary.DomainName @WriteSummary
+        Write-Color -Text '[>] Organizational Unit: ', $Results.UserResults.Summary.OrganizationalUnit @WriteSummary
+        Write-Color -Text '[>] Site: ', $Results.UserResults.Summary.Site @WriteSummary
+        Write-Color -Text '[>] GPO Types: ', ($Results.UserResults.Summary.GPOTypes -replace [System.Environment]::NewLine, ', ') @WriteSummary
+        Write-Color -Text '[>] Slow link: ', ($Results.UserResults.Summary.SlowLink) @WriteSummary
+
         Write-Color -Text 'Applied Group Policy Objects' -StartSpaces 3
         foreach ($GPO in $UserWhereApplied[0] ) {
             Write-Color -Text '[+] [', $GPO.DomainName, '] ', $GPO.Name @GPOSuccess

Private/New-GPOZaurrReportHTML.ps1

@@ -23,43 +23,42 @@ function New-GPOZaurrReportHTML {
     New-HTML -TitleText "Group Policy Report - $ComputerName" {
         #New-HTMLTabOptions -SlimTabs -Transition -LinearGradient -SelectorColor Akaroa
         New-HTMLTableOption -DataStore JavaScript -BoolAsString
+        New-HTMLSectionStyle -BorderRadius 0px -HeaderBackGroundColor Grey -RemoveShadow
+        New-HTMLPanelStyle -BorderRadius 0px
         New-HTMLTabOptions -SlimTabs `
             -BorderBottomStyleActive solid -BorderBottomColorActive LightSkyBlue -BackgroundColorActive none `
             -TextColorActive Black -Align left -BorderRadius 0px -RemoveShadow -TextColor Grey -TextTransform capitalize
         New-HTMLTab -Name 'Information' {
-            New-HTMLTable -DataTable $Support.ResultantSetPolicy -HideFooter -Transpose
-
             New-HTMLSection {
-                New-HTMLSection {
+                #New-HTMLTable -DataTable $Support.ResultantSetPolicy -HideFooter -Transpose
+                New-HTMLSection -HeaderText 'General Information' {
                     New-HTMLTable -DataTable $Support.ComputerInformation.Time -Filtering -Transpose {
                         New-TableHeader -Names 'Name', 'Value' -Title 'Time Information'
                     }
-                    New-HTMLTable -DataTable $Support.ComputerInformation.BIOS -Filtering -Transpose
+                    New-HTMLTable -DataTable $Support.ComputerInformation.BIOS -Filtering -Transpose {
+                        New-TableHeader -Names 'Name', 'Value' -Title 'BIOS Information'
+                    }
                 }
                 New-HTMLContainer {
-                    New-HTMLSection {
+                    New-HTMLSection -HeaderText 'CPU Information' {
                         New-HTMLTable -DataTable $Support.ComputerInformation.CPU -Filtering
                     }
-                    New-HTMLSection {
+                    New-HTMLSection -HeaderText 'RAM Information' {
                         New-HTMLTable -DataTable $Support.ComputerInformation.RAM -Filtering
                     }
                 }
-
             }
-            New-HTMLSection {
+            New-HTMLSection -HeaderText 'Operating System Information' {
                 New-HTMLTable -DataTable $Support.ComputerInformation.OperatingSystem -Filtering
                 New-HTMLTable -DataTable $Support.ComputerInformation.System -Filtering
             }
-            New-HTMLSection {
+            New-HTMLSection -HeaderText 'Disk Information' {
                 New-HTMLTable -DataTable $Support.ComputerInformation.Disk -Filtering
                 New-HTMLTable -DataTable $Support.ComputerInformation.DiskLogical -Filtering
             }
-            New-HTMLSection {
+            New-HTMLSection -HeaderText 'Services Information' {
                 New-HTMLTable -DataTable $Support.ComputerInformation.Services -Filtering
             }
-            New-HTMLSection {
-
-            }
         }
         foreach ($Key in $Support.Keys) {
             if ($Key -in 'ResultantSetPolicy', 'ComputerInformation') {
@@ -81,9 +80,9 @@ function New-GPOZaurrReportHTML {
                         New-HTMLTable -DataTable $Support.$Key.SummaryDownload -HideFooter
                     }
                     #>
-                    New-HTMLSection -HeaderText 'Resultant Set Policy' {
-                        New-HTMLTable -DataTable $Support.$Key.ResultantSetPolicy -HideFooter
-                    }
+                    #New-HTMLSection -HeaderText 'Resultant Set Policy' {
+                    #    New-HTMLTable -DataTable $Support.$Key.ResultantSetPolicy -HideFooter
+                    #}
                 }
                 New-HTMLTab -Name 'Group Policies' {
                     New-HTMLSection -Invisible {

Public/Get-GPOZaurr.ps1

@@ -5,7 +5,7 @@
         [string] $GPOName,
         [alias('GUID', 'GPOID')][string] $GPOGuid,
 
-        [validateset('Empty', 'Unlinked', 'Disabled', 'All')][string[]] $Type,
+        [validateset('Empty', 'Unlinked', 'Disabled', 'NoApplyPermission', 'All')][string[]] $Type,
 
         [alias('ForestName')][string] $Forest,
         [string[]] $ExcludeDomains,
@@ -54,58 +54,41 @@
                 $QueryServer = $ForestInformation.QueryServers[$Domain]['HostName'][0]
                 $Count = 0
                 if ($GPOName) {
-                    $GroupPolicies = Get-GPO -Name $GPOName -Domain $Domain -Server $QueryServer -ErrorAction SilentlyContinue
-                    $GroupPolicies | ForEach-Object {
-                        $Count++
-                        #Write-Verbose "Get-GPOZaurr - Getting GPO $($_.DisplayName) / ID: $($_.ID) from $Domain"
-                        Write-Verbose "Get-GPOZaurr - Processing [$($_.DomainName)]($Count/$($GroupPolicies.Count)) $($_.DisplayName)"
-                        if (-not $Limited) {
-                            try {
-                                $XMLContent = Get-GPOReport -ID $_.ID -ReportType XML -Server $ForestInformation.QueryServers[$Domain].HostName[0] -Domain $Domain -ErrorAction Stop
-                            } catch {
-                                Write-Warning "Get-GPOZaurr - Failed to get GPOReport: $($_.Exception.Message). Skipping."
-                                continue
-                            }
-                            Get-XMLGPO -OwnerOnly:$OwnerOnly.IsPresent -XMLContent $XMLContent -GPO $_ -PermissionsOnly:$PermissionsOnly.IsPresent -ADAdministrativeGroups $ADAdministrativeGroups -ReturnObject:$ReturnObject.IsPresent -ExcludeGroupPolicies $ExcludeGPO -Type $Type
-                        } else {
-                            $_
-                        }
+                    $getGPOSplat = @{
+                        Name        = $GPOName
+                        Domain      = $Domain
+                        Server      = $QueryServer
+                        ErrorAction = 'SilentlyContinue'
                     }
                 } elseif ($GPOGuid) {
-                    $GroupPolicies = Get-GPO -Guid $GPOGuid -Domain $Domain -Server $QueryServer -ErrorAction SilentlyContinue
-                    $GroupPolicies | ForEach-Object {
-                        $Count++
-                        #Write-Verbose "Get-GPOZaurr - Getting GPO $($_.DisplayName) / ID: $($_.ID) from $Domain"
-                        Write-Verbose "Get-GPOZaurr - Processing [$($_.DomainName)]($Count/$($GroupPolicies.Count)) $($_.DisplayName)"
-                        if (-not $Limited) {
-                            try {
-                                $XMLContent = Get-GPOReport -ID $_.ID -ReportType XML -Server $ForestInformation.QueryServers[$Domain].HostName[0] -Domain $Domain -ErrorAction Stop
-                            } catch {
-                                Write-Warning "Get-GPOZaurr - Failed to get GPOReport: $($_.Exception.Message). Skipping."
-                                continue
-                            }
-                            Get-XMLGPO -OwnerOnly:$OwnerOnly.IsPresent -XMLContent $XMLContent -GPO $_ -PermissionsOnly:$PermissionsOnly.IsPresent -ADAdministrativeGroups $ADAdministrativeGroups -ReturnObject:$ReturnObject.IsPresent -ExcludeGroupPolicies $ExcludeGPO -Type $Type
-                        } else {
-                            $_
-                        }
+                    $getGPOSplat = @{
+                        Guid        = $GPOGuid
+                        Domain      = $Domain
+                        Server      = $QueryServer
+                        ErrorAction = 'SilentlyContinue'
                     }
                 } else {
-                    $GroupPolicies = Get-GPO -All -Server $QueryServer -Domain $Domain -ErrorAction SilentlyContinue
-                    $GroupPolicies | ForEach-Object {
-                        $Count++
-                        #Write-Verbose "Get-GPOZaurr - Getting GPO $($_.DisplayName) / ID: $($_.ID) from $Domain"
-                        Write-Verbose "Get-GPOZaurr - Processing [$($_.DomainName)]($Count/$($GroupPolicies.Count)) $($_.DisplayName)"
-                        if (-not $Limited) {
-                            try {
-                                $XMLContent = Get-GPOReport -ID $_.ID -ReportType XML -Server $ForestInformation.QueryServers[$Domain].HostName[0] -Domain $Domain -ErrorAction Stop
-                            } catch {
-                                Write-Warning "Get-GPOZaurr - Failed to get GPOReport: $($_.Exception.Message). Skipping."
-                                continue
-                            }
-                            Get-XMLGPO -OwnerOnly:$OwnerOnly.IsPresent -XMLContent $XMLContent -GPO $_ -PermissionsOnly:$PermissionsOnly.IsPresent -ADAdministrativeGroups $ADAdministrativeGroups -ReturnObject:$ReturnObject.IsPresent -ExcludeGroupPolicies $ExcludeGPO -Type $Type
-                        } else {
-                            $_
+                    $getGPOSplat = @{
+                        All         = $true
+                        Server      = $QueryServer
+                        Domain      = $Domain
+                        ErrorAction = 'SilentlyContinue'
+                    }
+                }
+                $GroupPolicies = Get-GPO @getGPOSplat
+                foreach ($GPO in $GroupPolicies) {
+                    $Count++
+                    Write-Verbose "Get-GPOZaurr - Processing [$($GPO.DomainName)]($Count/$($GroupPolicies.Count)) $($_.DisplayName)"
+                    if (-not $Limited) {
+                        try {
+                            $XMLContent = Get-GPOReport -ID $GPO.ID -ReportType XML -Server $ForestInformation.QueryServers[$Domain].HostName[0] -Domain $Domain -ErrorAction Stop
+                        } catch {
+                            Write-Warning "Get-GPOZaurr - Failed to get [$($GPO.DomainName)]($Count/$($GroupPolicies.Count)) $($GPO.DisplayName) GPOReport: $($_.Exception.Message). Skipping."
+                            continue
                         }
+                        Get-XMLGPO -OwnerOnly:$OwnerOnly.IsPresent -XMLContent $XMLContent -GPO $GPO -PermissionsOnly:$PermissionsOnly.IsPresent -ADAdministrativeGroups $ADAdministrativeGroups -ReturnObject:$ReturnObject.IsPresent -ExcludeGroupPolicies $ExcludeGPO -Type $Type
+                    } else {
+                        $GPO
                     }
                 }
             }

Public/Invoke-GPOZaurrSupport.ps1

@@ -7,8 +7,8 @@
         [string] $Path,
         [string] $Splitter = [System.Environment]::NewLine,
         [switch] $PreventShow,
-        [switch] $Offline,
-        [switch] $ForceGPResult
+        [switch] $Offline #,
+        # [switch] $ForceGPResult
     )
     # if user didn't choose anything, lets run as currently logged in user locally
     if (-not $UserName -and -not $ComputerName) {
@@ -54,39 +54,43 @@
     if ($UserName) {
         $SplatPolicy['User'] = $UserName
     }
-    if ($Command -and -not $ForceGPResult) {
-        try {
-            #Write-Verbose "Request-GPOZaurr - ComputerName: $($SplatPolicy['Computer']) UserName: $($SplatPolicy['User'])"
-            $ResultantSetPolicy = Get-GPResultantSetOfPolicy @SplatPolicy -ErrorAction Stop
-        } catch {
-            if ($_.Exception.Message -eq 'Exception from HRESULT: 0x80041003') {
-                Write-Warning "Request-GPOZaurr - Are you running as admin? $($_.Exception.Message)"
-                return
-            } else {
-                $ErrorMessage = $($_.Exception.Message).Replace([Environment]::NewLine, ' ')
-                Write-Warning "Request-GPOZaurr - Error: $ErrorMessage"
-                return
-            }
+
+    $SplatPolicy['TempXmlPath'] = [io.path]::GetTempFileName().Replace('.tmp', ".xml")
+    # Originally planned to use Get-GPResultantSetOfPolicy but it only works with administrative rights
+    # if ($Command -and -not $ForceGPResult) {
+    #     try {
+    #         Write-Verbose "Invoke-GPOZaurrSupport - ComputerName: $($SplatPolicy['Computer']), UserName: $($SplatPolicy['User']), ReportType: $($SplatPolicy['ReportType']), Path: $($SplatPolicy['Path'])"
+    #         $ResultantSetPolicy = Get-GPResultantSetOfPolicy @SplatPolicy -ErrorAction Stop
+    #     } catch {
+    #         if ($_.Exception.Message -eq 'Exception from HRESULT: 0x80041003') {
+    #             Write-Warning "Invoke-GPOZaurrSupport - Are you running as admin? $($_.Exception.Message)"
+    #             return
+    #         } else {
+    #             $ErrorMessage = $($_.Exception.Message).Replace([Environment]::NewLine, ' ')
+    #             Write-Warning "Invoke-GPOZaurrSupport - Error: $ErrorMessage"
+    #             return
+    #         }
+    #     }
+    # } else {
+    $Arguments = @(
+        if ($SplatPolicy['Computer']) {
+            "/S $ComputerName"
         }
-    } else {
-        $Arguments = @(
-            if ($SplatPolicy['Computer']) {
-                "/S $ComputerName"
-            }
-            if ($SplatPolicy['User']) {
-                "/USER $($SplatPolicy['User'])"
-            }
-            if ($SplatPolicy['ReportType'] -eq 'HTML') {
-                '/H'
-            } elseif ($SplatPolicy['ReportType'] -eq 'XML') {
-                '/X'
-            }
+        if ($SplatPolicy['User']) {
+            "/USER $($SplatPolicy['User'])"
+        }
+        if ($SplatPolicy['ReportType'] -eq 'HTML') {
+            '/H'
             $SplatPolicy['Path']
-            "/F"
-        )
-        Write-Verbose "Invoke-GPOZaurrSupport - GPResult Arguments: $Arguments"
-        Start-Process -NoNewWindow -FilePath 'gpresult' -ArgumentList $Arguments -Wait
-    }
+        } elseif ($SplatPolicy['ReportType'] -eq 'XML') {
+            '/X'
+            $SplatPolicy['TempXmlPath']
+        }
+        "/F"
+    )
+    Write-Verbose "Invoke-GPOZaurrSupport - GPResult Arguments: $Arguments"
+    Start-Process -NoNewWindow -FilePath 'gpresult' -ArgumentList $Arguments -Wait
+    #}
     if ($Type -eq 'NativeHTML') {
         if (-not $PreventShow) {
             Write-Verbose "Invoke-GPOZaurrSupport - Opening up file $($SplatPolicy['Path'])"
@@ -95,39 +99,58 @@
         return
     }
     # Loads created XML by resultant Output
-    if ($SplatPolicy.Path -and (Test-Path -LiteralPath $SplatPolicy.Path)) {
-        [xml] $PolicyContent = Get-Content -LiteralPath $SplatPolicy.Path
+    if ($SplatPolicy.TempXmlPath -and (Test-Path -LiteralPath $SplatPolicy.TempXmlPath)) {
+        [xml] $PolicyContent = Get-Content -LiteralPath $SplatPolicy.TempXmlPath
         if ($PolicyContent) {
             # lets remove temporary XML file
-            Remove-Item -LiteralPath $SplatPolicy.Path
+            Remove-Item -LiteralPath $SplatPolicy.TempXmlPath
         } else {
-            Write-Warning "Request-GPOZaurr - Couldn't load XML file from drive $($SplatPolicy.Path). Terminating."
+            Write-Warning "Invoke-GPOZaurrSupport - Couldn't load XML file from drive $($SplatPolicy.TempXmlPath). Terminating."
             return
         }
     } else {
-        Write-Warning "Request-GPOZaurr - Couldn't find XML file on drive $($SplatPolicy.Path). Terminating."
+        Write-Warning "Invoke-GPOZaurrSupport - Couldn't find XML file on drive $($SplatPolicy.TempXmlPath). Terminating."
         return
     }
     if ($ComputerName) {
         if (-not $PolicyContent.Rsop.'ComputerResults'.EventsDetails) {
-            Write-Warning "Request-GPOZaurr - Windows Events for Group Policy are missing. Amount of data will be limited. Firewall issue?"
+            Write-Warning "Invoke-GPOZaurrSupport - Windows Events for Group Policy are missing. Amount of data will be limited. Firewall issue?"
         }
     }
+    if (-not $ComputerName) {
+        # Ok, user haven't given computername, and we're not admin, so RSOP won't be there, but we will use $ComputerName further down to get additional data, even without administrative rights
+        # Also for display purposes
+        $ComputerName = $Env:COMPUTERNAME
+    }
+
     if ($Type -eq 'XML') {
         $PolicyContent.Rsop
     } else {
+        if ($VerbosePreference -ne 'SilentlyContinue') {
+            $Verbose = $true
+        } else {
+            $Verbose = $false
+        }
         $Output = [ordered] @{
-            ComputerInformation = Get-Computer -ComputerName $ComputerName
-            ResultantSetPolicy  = $ResultantSetPolicy
+            ComputerInformation = Get-Computer -ComputerName $ComputerName -Verbose:$Verbose
+            #ResultantSetPolicy  = $ResultantSetPolicy
+
+            <# ResultantSetPolicy  = $ResultantSetPolicy
+            RunspaceId      : 5a4931ea-915e-42d3-80d8-6a86b16eb271
+            RsopMode        : Logging
+            Namespace       : \\EVOSPEED\Root\Rsop\NS103F4892_39E9_42B8_B0FF_E438EC0796B5
+            LoggingComputer : EVOSPEED
+            LoggingUser     : EVOTEC\przemyslaw.klys
+            LoggingMode     : UserAndComputer
+            #>
         }
         if ($PolicyContent.Rsop.ComputerResults) {
-            $Output.ComputerResults = ConvertFrom-XMLRSOP -Content $PolicyContent.Rsop -ResultantSetPolicy $ResultantSetPolicy -ResultsType 'ComputerResults' -Splitter $Splitter
+            $Output.ComputerResults = ConvertFrom-XMLRSOP -Content $PolicyContent.Rsop -ResultsType 'ComputerResults' -Splitter $Splitter
         }
         if ($PolicyContent.Rsop.UserResults) {
-            $Output.UserResults = ConvertFrom-XMLRSOP -Content $PolicyContent.Rsop -ResultantSetPolicy $ResultantSetPolicy -ResultsType 'UserResults' -Splitter $Splitter
+            $Output.UserResults = ConvertFrom-XMLRSOP -Content $PolicyContent.Rsop -ResultsType 'UserResults' -Splitter $Splitter
         }
-
-        New-GPOZaurrReportConsole -Results $Output
+        New-GPOZaurrReportConsole -Results $Output -ComputerName $ComputerName
         if ($Type -contains 'Object') {
             $Output
         } elseif ($Type -contains 'HTML') {

Public/Remove-GPOZaurr.ps1

@@ -2,7 +2,7 @@
     [cmdletBinding(SupportsShouldProcess)]
     param(
         [Parameter(Position = 1)][scriptblock] $ExcludeGroupPolicies,
-        [parameter(Position = 0, Mandatory)][validateset('Empty', 'Unlinked', 'Disabled')][string[]] $Type,
+        [parameter(Position = 0, Mandatory)][validateset('Empty', 'Unlinked', 'Disabled', 'NoApplyPermission')][string[]] $Type,
         [int] $LimitProcessing,
         [alias('ForestName')][string] $Forest,
         [string[]] $ExcludeDomains,
@@ -55,6 +55,11 @@
                     $DeleteRequired = $true
                 }
             }
+            if ($Type -contains 'NoApplyPermission') {
+                if ($_.ApplyPermission -eq $false) {
+                    $DeleteRequired = $true
+                }
+            }
             if ($_.Exclude -eq $true) {
                 Write-Verbose "Remove-GPOZaurr - Excluded GPO $($_.DisplayName) from $($_.DomainName). Skipping!"
             } elseif ($DeleteRequired) {

Publish/Manage-Module.ps1

@@ -0,0 +1,288 @@
+Clear-Host
+Import-Module "C:\Users\przemyslaw.klys\OneDrive - Evotec\Support\GitHub\PSPublishModule\PSPublishModule.psd1" -Force
+
+$Configuration = @{
+    Information = @{
+        ModuleName        = 'GPOZaurr'
+        DirectoryProjects = 'C:\Support\GitHub'
+
+        FunctionsToExport = 'Public'
+        AliasesToExport   = 'Public'
+
+        Manifest          = @{
+            # Version number of this module.
+            ModuleVersion              = '0.0.X'
+            # Supported PSEditions
+            CompatiblePSEditions       = @('Desktop')
+            # ID used to uniquely identify this module
+            GUID                       = 'f7d4c9e4-0298-4f51-ad77-e8e3febebbde'
+            # Author of this module
+            Author                     = 'Przemyslaw Klys'
+            # Company or vendor of this module
+            CompanyName                = 'Evotec'
+            # Copyright statement for this module
+            Copyright                  = "(c) 2011 - $((Get-Date).Year) Przemyslaw Klys @ Evotec. All rights reserved."
+            # Description of the functionality provided by this module
+            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.'
+            # Minimum version of the Windows PowerShell engine required by this module
+            PowerShellVersion          = '5.1'
+            # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
+            Tags                       = @('Windows', 'ActiveDirectory', 'GPO', 'GroupPolicy')
+            #IconUri              = 'https://evotec.xyz/wp-content/uploads/2019/02/PSPublishModule.png'
+
+            ProjectUri                 = 'https://github.com/EvotecIT/GPOZaurr'
+
+            RequiredModules            = @(
+                @{ ModuleName = 'PSSharedGoods'; ModuleVersion = 'Latest'; Guid = 'ee272aa8-baaa-4edf-9f45-b6d6f7d844fe' }
+                @{ ModuleName = 'ADEssentials'; ModuleVersion = 'Latest'; Guid = '9fc9fd61-7f11-4f4b-a527-084086f1905f' }
+                @{ ModuleName = 'PSWriteHTML'; ModuleVersion = "0.0.122"; Guid = 'a7bdf640-f5cb-4acf-9de0-365b322d245c' }
+            )
+            ExternalModuleDependencies = @(
+                #"ActiveDirectory"
+                #"GroupPolicy"
+                "CimCmdlets"
+                'Microsoft.PowerShell.Management'
+                'Microsoft.PowerShell.Utility'
+                'Microsoft.PowerShell.Security'
+            )
+            CommandModuleDependencies  = @{
+                ActiveDirectory = @(
+                    'Add-GPOPermission'
+                    'Add-GPOZaurrPermission'
+                    'Backup-GPOZaurr'
+                    'Clear-GPOZaurrSysvolDFSR'
+                    'ConvertFrom-CSExtension'
+                    'Find-CSExtension'
+                    'Get-GPOZaurr'
+                    'Get-GPOZaurrAD'
+                    'Get-GPOZaurrBackupInformation'
+                    'Get-GPOZaurrBroken'
+                    'Get-GPOZaurrDictionary'
+                    'Get-GPOZaurrDuplicateObject'
+                    'Get-GPOZaurrFiles'
+                    'Get-GPOZaurrFilesPolicyDefinition'
+                    'Get-GPOZaurrFolders'
+                    'Get-GPOZaurrInheritance'
+                    'Get-GPOZaurrLegacyFiles'
+                    'Get-GPOZaurrLink'
+                    'Get-GPOZaurrLinkSummary'
+                    'Get-GPOZaurrNetLogon'
+                    'Get-GPOZaurrOwner'
+                    'Get-GPOZaurrPassword'
+                    'Get-GPOZaurrPermission'
+                    'Get-GPOZaurrPermissionConsistency'
+                    '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-GPOZaurrPermission'
+                    'Remove-GPOZaurrWMI'
+                    'Repair-GPOZaurrNetLogonOwner'
+                    'Repair-GPOZaurrPermissionConsistency'
+                    'Restore-GPOZaurr'
+                    'Save-GPOZaurrFiles'
+                    'Set-GPOOwner'
+                    'Set-GPOZaurrOwner'
+                    'Find-GPO'
+                    'Get-GPOZaurrFilesPolicyDefinitions'
+                    'Get-GPOZaurrSysvol'
+                    'Remove-GPOZaurrOrphaned'
+                    'Show-GPO'
+                    'Show-GPOZaurr'
+                )
+                GroupPolicy     = @(
+                    'Add-GPOPermission'
+                    'Add-GPOZaurrPermission'
+                    'Backup-GPOZaurr'
+                    'Clear-GPOZaurrSysvolDFSR'
+                    'ConvertFrom-CSExtension'
+                    'Find-CSExtension'
+                    'Get-GPOZaurr'
+                    'Get-GPOZaurrAD'
+                    'Get-GPOZaurrBackupInformation'
+                    'Get-GPOZaurrBroken'
+                    'Get-GPOZaurrDictionary'
+                    'Get-GPOZaurrDuplicateObject'
+                    'Get-GPOZaurrFiles'
+                    'Get-GPOZaurrFilesPolicyDefinition'
+                    'Get-GPOZaurrFolders'
+                    'Get-GPOZaurrInheritance'
+                    'Get-GPOZaurrLegacyFiles'
+                    'Get-GPOZaurrLink'
+                    'Get-GPOZaurrLinkSummary'
+                    'Get-GPOZaurrNetLogon'
+                    'Get-GPOZaurrOwner'
+                    'Get-GPOZaurrPassword'
+                    'Get-GPOZaurrPermission'
+                    'Get-GPOZaurrPermissionConsistency'
+                    '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-GPOZaurrPermission'
+                    'Remove-GPOZaurrWMI'
+                    'Repair-GPOZaurrNetLogonOwner'
+                    'Repair-GPOZaurrPermissionConsistency'
+                    'Restore-GPOZaurr'
+                    'Save-GPOZaurrFiles'
+                    'Set-GPOOwner'
+                    'Set-GPOZaurrOwner'
+                    'Find-GPO'
+                    'Get-GPOZaurrFilesPolicyDefinitions'
+                    'Get-GPOZaurrSysvol'
+                    'Remove-GPOZaurrOrphaned'
+                    'Show-GPO'
+                    'Show-GPOZaurr'
+                )
+            }
+        }
+    }
+    Options     = @{
+        Merge             = @{
+            Sort           = 'None'
+            FormatCodePSM1 = @{
+                Enabled           = $true
+                RemoveComments    = $false
+                FormatterSettings = @{
+                    IncludeRules = @(
+                        'PSPlaceOpenBrace',
+                        'PSPlaceCloseBrace',
+                        'PSUseConsistentWhitespace',
+                        'PSUseConsistentIndentation',
+                        'PSAlignAssignmentStatement',
+                        'PSUseCorrectCasing'
+                    )
+
+                    Rules        = @{
+                        PSPlaceOpenBrace           = @{
+                            Enable             = $true
+                            OnSameLine         = $true
+                            NewLineAfter       = $true
+                            IgnoreOneLineBlock = $true
+                        }
+
+                        PSPlaceCloseBrace          = @{
+                            Enable             = $true
+                            NewLineAfter       = $false
+                            IgnoreOneLineBlock = $true
+                            NoEmptyLineBefore  = $false
+                        }
+
+                        PSUseConsistentIndentation = @{
+                            Enable              = $true
+                            Kind                = 'space'
+                            PipelineIndentation = 'IncreaseIndentationAfterEveryPipeline'
+                            IndentationSize     = 4
+                        }
+
+                        PSUseConsistentWhitespace  = @{
+                            Enable          = $true
+                            CheckInnerBrace = $true
+                            CheckOpenBrace  = $true
+                            CheckOpenParen  = $true
+                            CheckOperator   = $true
+                            CheckPipe       = $true
+                            CheckSeparator  = $true
+                        }
+
+                        PSAlignAssignmentStatement = @{
+                            Enable         = $true
+                            CheckHashtable = $true
+                        }
+
+                        PSUseCorrectCasing         = @{
+                            Enable = $true
+                        }
+                    }
+                }
+            }
+            FormatCodePSD1 = @{
+                Enabled        = $true
+                RemoveComments = $false
+            }
+            Integrate      = @{
+                ApprovedModules = 'PSSharedGoods', 'PSWriteColor', 'Connectimo', 'PSUnifi', 'PSWebToolbox', 'PSMyPassword', 'ADEssentials'
+            }
+        }
+        Standard          = @{
+            FormatCodePSM1 = @{
+
+            }
+            FormatCodePSD1 = @{
+                Enabled = $true
+                #RemoveComments = $true
+            }
+        }
+        PowerShellGallery = @{
+            ApiKey   = 'C:\Support\Important\PowerShellGalleryAPI.txt'
+            FromFile = $true
+        }
+        GitHub            = @{
+            ApiKey   = 'C:\Support\Important\GithubAPI.txt'
+            FromFile = $true
+            UserName = 'EvotecIT'
+            #RepositoryName = 'PSPublishModule' # not required, uses project name
+        }
+        Documentation     = @{
+            Path       = 'Docs'
+            PathReadme = 'Docs\Readme.md'
+        }
+        Style             = @{
+            PSD1 = 'Minimal' # Native
+        }
+    }
+    Steps       = @{
+        BuildModule        = @{  # requires Enable to be on to process all of that
+            Enable           = $true
+            DeleteBefore     = $false
+            Merge            = $true
+            MergeMissing     = $true
+            SignMerged       = $true
+            Releases         = $true
+            ReleasesUnpacked = $false
+            RefreshPSD1Only  = $false
+        }
+        BuildDocumentation = @{
+            Enable        = $false # enables documentation processing
+            StartClean    = $true # always starts clean
+            UpdateWhenNew = $true # always updates right after new
+        }
+        ImportModules      = @{
+            Self            = $true
+            RequiredModules = $false
+            Verbose         = $false
+        }
+        PublishModule      = @{  # requires Enable to be on to process all of that
+            Enabled      = $false
+            Prerelease   = ''
+            RequireForce = $false
+            GitHub       = $false
+        }
+    }
+}
+
+New-PrepareModule -Configuration $Configuration

README.md

@@ -57,7 +57,16 @@ That's it. Whenever there's a new version, you run the command, and you can enjo
 
 ## Changelog
 
-- 0.0.96
+- 0.0.98 - 10.12.2020
+  - [x] Improved `Invoke-GPOZaurr`
+    - [x] Type `GPOList` - fixed unexpected ending of cmdlet when error occurs (for example deleted GPO while script is running) which could impact results
+    - [x] Other types - small color adjustment
+  - [x] Fixed/Improved `Get-GPOZaurr` - fixed unexpected ending of cmdlet when error occurs (for example deleted GPO while script is running), improved code base
+  - [x] Improved `Invoke-GPOZaurrSupport`
+- 0.0.97 - 07.12.2020
+  - [x] Improved `Invoke-GPOZaurr`
+    - [x] Type `GPOList` - added more data, did small reorganization
+- 0.0.96 - 07.12.2020
   - [x] Improved `Invoke-GPOZaurr`
     - [x] Type `GPOList` - added more data, added Optimization Step
   - [x] Added `Set-GPOZaurrStatus`