From 52edd475328a115724a499df6d23f13800bba738 Mon Sep 17 00:00:00 2001
From: Przemyslaw Klys <przemyslaw.klys@evotec.pl>
Date: Tue, 29 Sep 2020 12:13:14 +0200
Subject: [PATCH] Update

---
 Examples/Example-19-TestSysvol.ps1            |  3 +-
 ...Example-20-RemoveOrphanedFoldersSysvol.ps1 |  4 +-
 Public/Get-GPOZaurrPermissionRoot.ps1         | 44 ++++++++-----------
 3 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/Examples/Example-19-TestSysvol.ps1 b/Examples/Example-19-TestSysvol.ps1
index 4a1def2..12241d7 100644
--- a/Examples/Example-19-TestSysvol.ps1
+++ b/Examples/Example-19-TestSysvol.ps1
@@ -1,3 +1,4 @@
 Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force
 
-Get-GPOZaurrSysvol -Verbose | Format-Table
\ No newline at end of file
+Get-GPOZaurrSysvol -Verbose | Format-Table
+#Get-GPOZaurrSysvol | Out-HtmlView -ScrollX
\ No newline at end of file
diff --git a/Examples/Example-20-RemoveOrphanedFoldersSysvol.ps1 b/Examples/Example-20-RemoveOrphanedFoldersSysvol.ps1
index 919ae99..d9238c9 100644
--- a/Examples/Example-20-RemoveOrphanedFoldersSysvol.ps1
+++ b/Examples/Example-20-RemoveOrphanedFoldersSysvol.ps1
@@ -1,7 +1,7 @@
 Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force
 
 # this allows you to process X amount of orphaned folders/files (good for testing)
-Remove-GPOZaurrOrphanedSysvolFolders -Verbose -WhatIf -LimitProcessing 2 -IncludeDomains 'ad.evotec.xyz'
+Remove-GPOZaurrOrphaned -Verbose -WhatIf -IncludeDomains 'ad.evotec.xyz' #-LimitProcessing 2
 
 # this runs for whole SYSVOL and checks things against GPOS
-Remove-GPOZaurrOrphanedSysvolFolders -Verbose -IncludeDomains 'ad.evotec.xyz' -BackupPath $Env:UserProfile\Desktop\MyBackup1 #-WhatIf
\ No newline at end of file
+Remove-GPOZaurrOrphaned -Verbose -IncludeDomains 'ad.evotec.xyz' -BackupPath $Env:UserProfile\Desktop\MyBackup1 -WhatIf
\ No newline at end of file
diff --git a/Public/Get-GPOZaurrPermissionRoot.ps1 b/Public/Get-GPOZaurrPermissionRoot.ps1
index ebeb574..e7fc733 100644
--- a/Public/Get-GPOZaurrPermissionRoot.ps1
+++ b/Public/Get-GPOZaurrPermissionRoot.ps1
@@ -7,8 +7,6 @@
         [System.Collections.IDictionary] $ExtendedForestInformation
     )
     Begin {
-        #$Owners = [System.Collections.Generic.List[object]]::new()
-        #$Modify = [System.Collections.Generic.List[object]]::new()
         $ForestInformation = Get-WinADForestDetails -Forest $Forest -IncludeDomains $IncludeDomains -ExcludeDomains $ExcludeDomains -ExtendedForestInformation $ExtendedForestInformation -Extended
     }
     Process {
@@ -22,43 +20,39 @@
                 ADRightsAsArray                = $true
                 ResolveTypes                   = $true
             }
-            $GPOPermissionsGlobal = Get-ADACL @getADACLSplat
-            #$GPOPermissionsGlobal | Format-Table
+            $GPOPermissionsGlobal = Get-ADACL @getADACLSplat #-Verbose
             foreach ($Permission in $GPOPermissionsGlobal) {
                 if ($Permission.ActiveDirectoryRights | ForEach-Object {
                         $_ -in 'WriteDACL', 'WriteOwner', 'GenericAll'
                     }) {
                     [PSCustomObject] @{
-                        Permission     = 'GpoCustomOwner'
-                        Type           = $Permission.PrincipalObjectType
-                        Name           = $Permission.Principal
-                        DomainName     = $Permission.PrincipalObjectDomain
-                        PermissionType = $Permission.AccessControlType
-                        GPOCount       = 'N/A'
-                        GPONames       = 'All'
+                        PrincipalName       = $Permission.Principal
+                        Permission          = 'GpoCustomOwner'
+                        PermissionType      = $Permission.AccessControlType
+                        PrincipalSid        = $Permission.PrincipalObjectSid
+                        PrincipalSidType    = $Permission.PrincipalObjectType
+                        PrincipalDomainName = $Permission.PrincipalObjectDomain
+                        GPOCount            = 'N/A'
+                        GPONames            = -join ("All-", $Domain.ToUpper())
+                        DomainName          = $Domain
                     }
-                    #$Owners.Add($Permission)
                 }
                 if ($Permission.ActiveDirectoryRights | ForEach-Object {
                         $_ -in 'CreateChild', 'GenericAll'
                     }) {
-
                     [PSCustomObject] @{
-                        Permission     = 'GpoCustomCreate'
-                        Type           = $Permission.PrincipalObjectType
-                        Name           = $Permission.Principal
-                        DomainName     = $Permission.PrincipalObjectDomain
-                        PermissionType = $Permission.AccessControlType
-                        GPOCount       = 'N/A'
-                        GPONames       = 'All'
+                        PrincipalName       = $Permission.Principal
+                        Permission          = 'GpoCustomCreate'
+                        PermissionType      = $Permission.AccessControlType
+                        PrincipalSid        = $Permission.PrincipalObjectSid
+                        PrincipalSidType    = $Permission.PrincipalObjectType
+                        PrincipalDomainName = $Permission.PrincipalObjectDomain
+                        GPOCount            = 'N/A'
+                        GPONames            = -join ("All-", $Domain.ToUpper())
+                        DomainName          = $Domain
                     }
-
-                    #$Modify.Add($Permission)
                 }
             }
-            #$Owners | Format-Table
-
-            #$Modify | Format-Table
         }
     }
     End {}