From 89664bfd02a16b8345fcc98bece901105641e7a1 Mon Sep 17 00:00:00 2001 From: Przemyslaw Klys Date: Sat, 10 Apr 2021 20:35:33 +0200 Subject: [PATCH] Add searchBuilder to tables --- Private/Invoke.GPOZaurrBlockedInheritance.ps1 | 2 +- Private/Invoke.GPOZaurrBrokenLink.ps1 | 2 +- Private/Invoke.GPOZaurrConsistency.ps1 | 2 +- Private/Invoke.GPOZaurrDuplicate.ps1 | 2 +- Private/Invoke.GPOZaurrFiles.ps1 | 2 +- Private/Invoke.GPOZaurrLinks.ps1 | 2 +- Private/Invoke.GPOZaurrList.ps1 | 2 +- Private/Invoke.GPOZaurrNetLogonOwners.ps1 | 2 +- Private/Invoke.GPOZaurrNetLogonPermissions.ps1 | 2 +- Private/Invoke.GPOZaurrOrphans.ps1 | 2 +- Private/Invoke.GPOZaurrOwners.ps1 | 2 +- Private/Invoke.GPOZaurrPassword.ps1 | 2 +- Private/Invoke.GPOZaurrPermissionsAdministrative.ps1 | 4 ++-- Private/Invoke.GPOZaurrPermissionsAnalysis.ps1 | 6 +++--- Private/Invoke.GPOZaurrPermissionsRead.ps1 | 4 ++-- Private/Invoke.GPOZaurrPermissionsRoot.ps1 | 2 +- Private/Invoke.GPOZaurrPermissionsUnknown.ps1 | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Private/Invoke.GPOZaurrBlockedInheritance.ps1 b/Private/Invoke.GPOZaurrBlockedInheritance.ps1 index 644c253..006c347 100644 --- a/Private/Invoke.GPOZaurrBlockedInheritance.ps1 +++ b/Private/Invoke.GPOZaurrBlockedInheritance.ps1 @@ -22,7 +22,7 @@ New-HTMLTable -DataTable $Script:Reporting['GPOBlockedInheritance']['WarningsAndErrors'] -Filtering { New-HTMLTableCondition -Name 'Type' -Value 'Warning' -BackgroundColor SandyBrown -ComparisonType string -Row New-HTMLTableCondition -Name 'Type' -Value 'Error' -BackgroundColor Salmon -ComparisonType string -Row - } + } -SearchBuilder } } } diff --git a/Private/Invoke.GPOZaurrBrokenLink.ps1 b/Private/Invoke.GPOZaurrBrokenLink.ps1 index 3d717e2..c6a4b81 100644 --- a/Private/Invoke.GPOZaurrBrokenLink.ps1 +++ b/Private/Invoke.GPOZaurrBrokenLink.ps1 @@ -76,7 +76,7 @@ $GPOZaurrBrokenLink = [ordered] @{ New-HTMLSection -Name 'Group Policy Broken Links' { New-HTMLTable -DataTable $Script:Reporting['GPOBrokenLink']['Data'] -Filtering { - } -PagingOptions 10, 20, 30, 40, 50 + } -PagingOptions 10, 20, 30, 40, 50 -SearchBuilder } if ($Script:Reporting['Settings']['HideSteps'] -eq $false) { New-HTMLSection -Name 'Steps to remove Broken Links' { diff --git a/Private/Invoke.GPOZaurrConsistency.ps1 b/Private/Invoke.GPOZaurrConsistency.ps1 index b2803a2..3066945 100644 --- a/Private/Invoke.GPOZaurrConsistency.ps1 +++ b/Private/Invoke.GPOZaurrConsistency.ps1 @@ -91,7 +91,7 @@ New-HTMLTableCondition -Name 'ACLConsistentInside' -Value $true -BackgroundColor PaleGreen -TextTransform capitalize -ComparisonType string New-HTMLTableCondition -Name 'ACLConsistent' -Value 'Not available' -BackgroundColor Crimson -ComparisonType string New-HTMLTableCondition -Name 'ACLConsistentInside' -Value 'Not available' -BackgroundColor Crimson -ComparisonType string - } -PagingOptions 10, 20, 30, 40, 50 + } -PagingOptions 10, 20, 30, 40, 50 -SearchBuilder } if ($Script:Reporting['Settings']['HideSteps'] -eq $false) { New-HTMLSection -Name 'Steps to fix - Permissions Consistency' { diff --git a/Private/Invoke.GPOZaurrDuplicate.ps1 b/Private/Invoke.GPOZaurrDuplicate.ps1 index bd58c17..d59549f 100644 --- a/Private/Invoke.GPOZaurrDuplicate.ps1 +++ b/Private/Invoke.GPOZaurrDuplicate.ps1 @@ -48,7 +48,7 @@ New-HTMLSection -Name 'Group Policy CNF (Duplicate) Objects' { New-HTMLTable -DataTable $Script:Reporting['GPODuplicates']['Data'] -Filtering { - } -PagingOptions 10, 20, 30, 40, 50 + } -PagingOptions 10, 20, 30, 40, 50 -SearchBuilder } if ($Script:Reporting['Settings']['HideSteps'] -eq $false) { New-HTMLSection -Name 'Steps to fix - Remove duplicate (CNF) objects' { diff --git a/Private/Invoke.GPOZaurrFiles.ps1 b/Private/Invoke.GPOZaurrFiles.ps1 index f96d416..7def9bf 100644 --- a/Private/Invoke.GPOZaurrFiles.ps1 +++ b/Private/Invoke.GPOZaurrFiles.ps1 @@ -22,7 +22,7 @@ New-HTMLTable -DataTable $Script:Reporting['GPOFiles']['WarningsAndErrors'] -Filtering { New-HTMLTableCondition -Name 'Type' -Value 'Warning' -BackgroundColor SandyBrown -ComparisonType string -Row New-HTMLTableCondition -Name 'Type' -Value 'Error' -BackgroundColor Salmon -ComparisonType string -Row - } + } -SearchBuilder } } } diff --git a/Private/Invoke.GPOZaurrLinks.ps1 b/Private/Invoke.GPOZaurrLinks.ps1 index e966ad1..f7ffe4c 100644 --- a/Private/Invoke.GPOZaurrLinks.ps1 +++ b/Private/Invoke.GPOZaurrLinks.ps1 @@ -22,7 +22,7 @@ $GPOZaurrLinks = [ordered] @{ New-HTMLTable -DataTable $Script:Reporting['GPOLinks']['WarningsAndErrors'] -Filtering { New-HTMLTableCondition -Name 'Type' -Value 'Warning' -BackgroundColor SandyBrown -ComparisonType string -Row New-HTMLTableCondition -Name 'Type' -Value 'Error' -BackgroundColor Salmon -ComparisonType string -Row - } + } -SearchBuilder } } } diff --git a/Private/Invoke.GPOZaurrList.ps1 b/Private/Invoke.GPOZaurrList.ps1 index bd4487a..0a9eb4f 100644 --- a/Private/Invoke.GPOZaurrList.ps1 +++ b/Private/Invoke.GPOZaurrList.ps1 @@ -358,7 +358,7 @@ New-HTMLTableCondition -Name 'UserProblem' -Value $false -BackgroundColor SpringGreen -ComparisonType string New-HTMLTableCondition -Name 'ComputerOptimized' -Value $true -BackgroundColor SpringGreen -ComparisonType string New-HTMLTableCondition -Name 'UserOptimized' -Value $true -BackgroundColor SpringGreen -TextTransform capitalize -ComparisonType string - } -PagingOptions 10, 20, 30, 40, 50 + } -PagingOptions 10, 20, 30, 40, 50 -SearchBuilder } } if ($Script:Reporting['Settings']['HideSteps'] -eq $false) { diff --git a/Private/Invoke.GPOZaurrNetLogonOwners.ps1 b/Private/Invoke.GPOZaurrNetLogonOwners.ps1 index 0fcf1d8..2d60c92 100644 --- a/Private/Invoke.GPOZaurrNetLogonOwners.ps1 +++ b/Private/Invoke.GPOZaurrNetLogonOwners.ps1 @@ -135,7 +135,7 @@ New-HTMLTableCondition -Name 'OwnerType' -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 - } + } -SearchBuilder } if ($Script:Reporting['Settings']['HideSteps'] -eq $false) { New-HTMLSection -Name 'Steps to fix NetLogon Owners ' { diff --git a/Private/Invoke.GPOZaurrNetLogonPermissions.ps1 b/Private/Invoke.GPOZaurrNetLogonPermissions.ps1 index 25d9c32..191227c 100644 --- a/Private/Invoke.GPOZaurrNetLogonPermissions.ps1 +++ b/Private/Invoke.GPOZaurrNetLogonPermissions.ps1 @@ -237,7 +237,7 @@ New-HTMLTableCondition -Name 'Status' -Value "Review permission required" -BackgroundColor PaleGoldenrod -ComparisonType string -Operator eq New-HTMLTableCondition -Name 'Status' -Value "Removal permission required" -BackgroundColor Salmon -ComparisonType string -Operator eq -Row New-HTMLTableCondition -Name 'Status' -Value "OK" -BackgroundColor LightGreen -ComparisonType string -Operator eq - } + } -SearchBuilder } if ($Script:Reporting['Settings']['HideSteps'] -eq $false) { New-HTMLSection -Name 'Steps to fix NetLogon Permissions ' { diff --git a/Private/Invoke.GPOZaurrOrphans.ps1 b/Private/Invoke.GPOZaurrOrphans.ps1 index d95b97c..94c8c80 100644 --- a/Private/Invoke.GPOZaurrOrphans.ps1 +++ b/Private/Invoke.GPOZaurrOrphans.ps1 @@ -128,7 +128,7 @@ New-HTMLTableCondition -Name 'Status' -Value "Not available on SYSVOL" -BackgroundColor LightCoral -ComparisonType string New-HTMLTableCondition -Name 'Status' -Value "ObjectClass issue" -BackgroundColor MediumOrchid -ComparisonType string New-HTMLTableCondition -Name 'Status' -Value "Permissions issue" -BackgroundColor MediumVioletRed -ComparisonType string -Color White - } -PagingOptions 10, 20, 30, 40, 50 + } -PagingOptions 10, 20, 30, 40, 50 -SearchBuilder } if ($Script:Reporting['Settings']['HideSteps'] -eq $false) { New-HTMLSection -Name 'Steps to fix - Not available on SYSVOL / Active Directory / ObjectClass issue' { diff --git a/Private/Invoke.GPOZaurrOwners.ps1 b/Private/Invoke.GPOZaurrOwners.ps1 index c236767..b96cb45 100644 --- a/Private/Invoke.GPOZaurrOwners.ps1 +++ b/Private/Invoke.GPOZaurrOwners.ps1 @@ -134,7 +134,7 @@ New-HTMLTable -DataTable $Script:Reporting['GPOOwners']['Data'] -Filtering { New-HTMLTableCondition -Name 'IsOwnerConsistent' -Value $false -BackgroundColor Salmon -ComparisonType string -Row New-HTMLTableCondition -Name 'IsOwnerAdministrative' -Value $false -BackgroundColor Salmon -ComparisonType string -Row - } -PagingOptions 10, 20, 30, 40, 50 + } -PagingOptions 10, 20, 30, 40, 50 -SearchBuilder } if ($Script:Reporting['Settings']['HideSteps'] -eq $false) { New-HTMLSection -Name 'Steps to fix Group Policy Owners' { diff --git a/Private/Invoke.GPOZaurrPassword.ps1 b/Private/Invoke.GPOZaurrPassword.ps1 index af9c811..36c52ff 100644 --- a/Private/Invoke.GPOZaurrPassword.ps1 +++ b/Private/Invoke.GPOZaurrPassword.ps1 @@ -23,7 +23,7 @@ New-HTMLTable -DataTable $Script:Reporting['GPOPassword']['WarningsAndErrors'] -Filtering { New-HTMLTableCondition -Name 'Type' -Value 'Warning' -BackgroundColor SandyBrown -ComparisonType string -Row New-HTMLTableCondition -Name 'Type' -Value 'Error' -BackgroundColor Salmon -ComparisonType string -Row - } + } -SearchBuilder } } } diff --git a/Private/Invoke.GPOZaurrPermissionsAdministrative.ps1 b/Private/Invoke.GPOZaurrPermissionsAdministrative.ps1 index 33e9d1d..d786304 100644 --- a/Private/Invoke.GPOZaurrPermissionsAdministrative.ps1 +++ b/Private/Invoke.GPOZaurrPermissionsAdministrative.ps1 @@ -94,12 +94,12 @@ New-HTMLSection -Name 'Group Policy Administrative Users Permissions Summary' { New-HTMLTable -DataTable $Script:Reporting['GPOPermissionsAdministrative']['Data'].PermissionsPerRow -Filtering { New-HTMLTableCondition -Name 'Permission' -Value '' -BackgroundColor Salmon -ComparisonType string -Row - } -PagingOptions 7, 15, 30, 45, 60 + } -PagingOptions 7, 15, 30, 45, 60 -SearchBuilder } New-HTMLSection -Name 'Group Policy Administrative Users Analysis' { New-HTMLTable -DataTable $Script:Reporting['GPOPermissionsAdministrative']['Data'].PermissionsAnalysis -Filtering { # New-HTMLTableCondition -Name 'Permission' -Value '' -BackgroundColor Salmon -ComparisonType string -Row - } -PagingOptions 7, 15, 30, 45, 60 + } -PagingOptions 7, 15, 30, 45, 60 -SearchBuilder } if ($Script:Reporting['Settings']['HideSteps'] -eq $false) { New-HTMLSection -Name 'Steps to fix Group Policy Administrative Users' { diff --git a/Private/Invoke.GPOZaurrPermissionsAnalysis.ps1 b/Private/Invoke.GPOZaurrPermissionsAnalysis.ps1 index 49e2f52..8fa7412 100644 --- a/Private/Invoke.GPOZaurrPermissionsAnalysis.ps1 +++ b/Private/Invoke.GPOZaurrPermissionsAnalysis.ps1 @@ -309,7 +309,7 @@ New-HTMLSection -Name 'Group Policy Visibility Analysis' { New-HTMLTable -DataTable $Script:Reporting['GPOPermissions']['Data'].PermissionsIssues -Filtering { New-HTMLTableCondition -Name 'PermissionIssue' -Value $true -BackgroundColor Salmon -ComparisonType string -Row - } -PagingOptions 7, 15, 30, 45, 60 -DefaultSortColumn PermissionIssue -DefaultSortOrder Descending + } -PagingOptions 7, 15, 30, 45, 60 -DefaultSortColumn PermissionIssue -DefaultSortOrder Descending -SearchBuilder } New-HTMLSection -Name 'Group Policy Permissions Analysis' { New-HTMLContainer { @@ -344,7 +344,7 @@ New-HTMLTableCondition -Name 'EnterpriseAdmins' -Value 'True' -BackgroundColor Salmon -ComparisonType string -Operator ne New-TableEvent -TableID 'GPOPermissionsAll' -SourceColumnName 'GUID' -TargetColumnID 1 # TargetColumnID 1 eq GUID on the other table - } -PagingOptions 7, 15, 30, 45, 60 + } -PagingOptions 7, 15, 30, 45, 60 -SearchBuilder } } New-HTMLSection -Name 'All Permissions' { @@ -355,7 +355,7 @@ New-HTMLTableCondition -Name 'Permission' -Value 'GpoApply' -BackgroundColor Orange -ComparisonType string New-HTMLTableCondition -Name 'Permission' -Value 'GpoRead' -BackgroundColor MediumSpringGreen -ComparisonType string -Operator eq New-HTMLTableCondition -Name 'PrincipalSidType' -Value 'Unknown' -BackgroundColor Salmon -ComparisonType string -Operator eq - } -PagingOptions 7, 15, 30, 45, 60 -DataTableID 'GPOPermissionsAll' + } -PagingOptions 7, 15, 30, 45, 60 -DataTableID 'GPOPermissionsAll' -SearchBuilder } if ($Script:Reporting['Settings']['HideSteps'] -eq $false) { New-HTMLSection -Name 'Steps to fix Group Policy Administrative Users' { diff --git a/Private/Invoke.GPOZaurrPermissionsRead.ps1 b/Private/Invoke.GPOZaurrPermissionsRead.ps1 index bb959a2..a935bc9 100644 --- a/Private/Invoke.GPOZaurrPermissionsRead.ps1 +++ b/Private/Invoke.GPOZaurrPermissionsRead.ps1 @@ -151,12 +151,12 @@ New-HTMLSection -Name 'Group Policy Authenticated Users Analysis' { New-HTMLTable -DataTable $Script:Reporting['GPOPermissionsRead']['Data'].Permissions -Filtering { New-HTMLTableCondition -Name 'Permission' -Value '' -BackgroundColor Salmon -ComparisonType string -Row - } -PagingOptions 7, 15, 30, 45, 60 + } -PagingOptions 7, 15, 30, 45, 60 -SearchBuilder } New-HTMLSection -Name 'Group Policy Issues Assesment' { New-HTMLTable -DataTable $Script:Reporting['GPOPermissionsRead']['Data'].Issues -Filtering { New-HTMLTableCondition -Name 'PermissionIssue' -Value $true -BackgroundColor Salmon -ComparisonType string -Row - } -PagingOptions 7, 15, 30, 45, 60 -DefaultSortColumn PermissionIssue -DefaultSortOrder Descending + } -PagingOptions 7, 15, 30, 45, 60 -DefaultSortColumn PermissionIssue -DefaultSortOrder Descending -SearchBuilder } if ($Script:Reporting['Settings']['HideSteps'] -eq $false) { New-HTMLSection -Name 'Steps to fix Group Policy Authenticated Users' { diff --git a/Private/Invoke.GPOZaurrPermissionsRoot.ps1 b/Private/Invoke.GPOZaurrPermissionsRoot.ps1 index 4713737..e6d3f34 100644 --- a/Private/Invoke.GPOZaurrPermissionsRoot.ps1 +++ b/Private/Invoke.GPOZaurrPermissionsRoot.ps1 @@ -22,7 +22,7 @@ New-HTMLTable -DataTable $Script:Reporting['GPOPermissionsRoot']['WarningsAndErrors'] -Filtering { New-HTMLTableCondition -Name 'Type' -Value 'Warning' -BackgroundColor SandyBrown -ComparisonType string -Row New-HTMLTableCondition -Name 'Type' -Value 'Error' -BackgroundColor Salmon -ComparisonType string -Row - } + } -SearchBuilder } } } diff --git a/Private/Invoke.GPOZaurrPermissionsUnknown.ps1 b/Private/Invoke.GPOZaurrPermissionsUnknown.ps1 index 844b0de..490f7e3 100644 --- a/Private/Invoke.GPOZaurrPermissionsUnknown.ps1 +++ b/Private/Invoke.GPOZaurrPermissionsUnknown.ps1 @@ -71,7 +71,7 @@ New-HTMLSection -Name 'Group Policy Unknown Permissions Analysis' { New-HTMLTable -DataTable $Script:Reporting['GPOPermissionsUnknown']['Data'] -Filtering { New-HTMLTableCondition -Name 'Permission' -Value '' -BackgroundColor Salmon -ComparisonType string -Row - } -PagingOptions 7, 15, 30, 45, 60 + } -PagingOptions 7, 15, 30, 45, 60 -SearchBuilder } if ($Script:Reporting['Settings']['HideSteps'] -eq $false) { New-HTMLSection -Name 'Steps to fix Group Policy Unknown Permissions' {