Bump version

fix splitreports to start creating reports right away

CHANGELOG.MD

@@ -1,5 +1,23 @@
 # GPOZaurr Release History
 
+## 0.0.156 - 2022.12.04
+  - Fixes `Get-LocalComputerSid - Error: You cannot call a method on a null-valued expression` in some rare cases [#34](https://github.com/EvotecIT/GPOZaurr/issues/34)
+
+## 0.0.155 - 2022.10.27
+  - Fixes `Invoke-GPOZaurr` SplitReports functionality (again! and again!) [#35](https://github.com/EvotecIT/GPOZaurr/issues/35)
+
+## 0.0.154 - 2022.10.20
+  - Fixes `Invoke-GPOZaurr` SplitReports functionality (again!) [#33](https://github.com/EvotecIT/GPOZaurr/issues/33)
+  - Fixes Sysvol property in object returned by Get-GPOZaurrPermissionConsistency contains whitespace [#31](https://github.com/EvotecIT/GPOZaurr/issues/31)
+
+## 0.0.153 - 2022.09.12
+  - Fixes `Invoke-GPOZaurr` SplitReports functionality that would generate main report anyways.
+
+## 0.0.152 - 2022.09.11
+  - ℹ️ Improved `Invoke-GPOZaurr` - disable deprecated reports if user doesn't ask for them but asks for all reports to be generated. Those reports are now disabled by default: GPOPermissionsAdministrative,GPOPermissionsRead,GPOPermissionsRoot,GPOPermissionsUnknown
+  - ℹ️ Improved `Invoke-GPOZaurr` SplitReports functionality to start creating HTML reports every report
+  - Add `Export-GPOZaurrContent` to simplify quick export of all XML/HTML reports from GPO
+
 ## 0.0.151 - 2022.07.26
   - ℹ️ Improved `Invoke-GPOZaurr` by adding `SplitReports` functionality. This will allow you to split the reports into multiple files with a single request.
   - ℹ️ Improved `Get-GPOZaurrInheritance` with some error handling

Docs/Export-GPOZaurrContent.md

@@ -0,0 +1,73 @@
+---
+external help file: GPOZaurr-help.xml
+Module Name: GPOZaurr
+online version:
+schema: 2.0.0
+---
+
+# Export-GPOZaurrContent
+
+## SYNOPSIS
+Saves GPOs to XML or HTML files.
+
+## SYNTAX
+
+```
+Export-GPOZaurrContent [-FolderOutput] <String> [[-ReportType] <String>] [<CommonParameters>]
+```
+
+## DESCRIPTION
+Saves GPOs to XML or HTML files.
+
+## EXAMPLES
+
+### EXAMPLE 1
+```
+An example
+```
+
+## PARAMETERS
+
+### -FolderOutput
+The folder where the GPOs will be saved.
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases: Path
+
+Required: True
+Position: 1
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -ReportType
+The type of report to generate.
+Valid values are XML or HTML.
+Default is XML.
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: 2
+Default value: XML
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### CommonParameters
+This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
+
+## INPUTS
+
+## OUTPUTS
+
+## NOTES
+General notes
+
+## RELATED LINKS

Docs/Readme.md

@@ -26,6 +26,9 @@ Provides Backup functionality to Group Policies
 ### [ConvertFrom-CSExtension](ConvertFrom-CSExtension.md)
 {{ Fill in the Synopsis }}
 
+### [Export-GPOZaurrContent](Export-GPOZaurrContent.md)
+Saves GPOs to XML or HTML files.
+
 ### [Find-CSExtension](Find-CSExtension.md)
 {{ Fill in the Synopsis }}
 

Examples/Example-29-FindGPO2.ps1

@@ -2,7 +2,7 @@
 
 # This gets the same thing as earlier examples
 # with a difference where one entry per gpo and all settings for that GPO is stored under settings property.
-$Output = Invoke-GPOZaurrContent -SingleObject -Verbose
+$Output = Invoke-GPOZaurrContent -Verbose #-SingleObject -Verbose
 $Output | Format-Table
 $Output.Reports.RegistrySettings | Format-Table *
 $Output.Reports.RegistrySettings[0].Settings | Format-Table *

Examples/Example-29-FindGPO4.ps1

@@ -1,4 +1,4 @@
 Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force
 
-$Output = Invoke-GPOZaurrContent -Verbose -OutputType HTML, Object -Open -GPOPath "C:\Support\GitHub\GpoZaurr\Ignore\NewExamples"  ##-Type LocalGroups
+$Output = Invoke-GPOZaurrContent -SingleObject -Verbose -OutputType HTML, Object -Open -GPOPath "C:\Users\przemyslaw.klys\OneDrive - Evotec\Desktop\Test"
 $Output | Format-Table

Examples/Example-40-ShowGPO06.ps1

@@ -1,3 +1,3 @@
 Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force
 
-Invoke-GPOZaurr -Type GPOUpdates -Online -Verbose #-IncludeDomains 'ad.evotec.pl'
+Invoke-GPOZaurr -Online -Verbose -FilePath $PSScriptRoot\Reports\GPOZaurr.html -SplitReports

Examples/Example-53-ExportGPOContent.ps1

@@ -0,0 +1,3 @@
+Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force
+
+Export-GPOZaurrContent -FolderOutput $PSScriptRoot\ExportedXML -ReportType XML

GPOZaurr.psd1

@@ -6,9 +6,9 @@
     CompatiblePSEditions = @('Desktop')
     Copyright            = '(c) 2011 - 2022 Przemyslaw Klys @ Evotec. All rights reserved.'
     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-GPOZaurrUpdates', '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')
+    FunctionsToExport    = @('Add-GPOPermission', 'Add-GPOZaurrPermission', 'Backup-GPOZaurr', 'Clear-GPOZaurrSysvolDFSR', 'ConvertFrom-CSExtension', 'Export-GPOZaurrContent', '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-GPOZaurrUpdates', '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.151'
+    ModuleVersion        = '0.0.156'
     PowerShellVersion    = '5.1'
     PrivateData          = @{
         PSData = @{
@@ -18,15 +18,15 @@
         }
     }
     RequiredModules      = @(@{
-            ModuleVersion = '0.0.232'
+            ModuleVersion = '0.0.252'
             ModuleName    = 'PSSharedGoods'
             Guid          = 'ee272aa8-baaa-4edf-9f45-b6d6f7d844fe'
         }, @{
-            ModuleVersion = '0.0.146'
+            ModuleVersion = '0.0.148'
             ModuleName    = 'ADEssentials'
             Guid          = '9fc9fd61-7f11-4f4b-a527-084086f1905f'
         }, @{
-            ModuleVersion = '0.0.175'
+            ModuleVersion = '0.0.180'
             ModuleName    = 'PSWriteHTML'
             Guid          = 'a7bdf640-f5cb-4acf-9de0-365b322d245c'
         }, 'CimCmdlets', 'Microsoft.PowerShell.Management', 'Microsoft.PowerShell.Utility', 'Microsoft.PowerShell.Security')

Private/Invoke.GPOZaurrPermissionsAdministrative.ps1

@@ -1,6 +1,6 @@
 $GPOZaurrPermissionsAdministrative = [ordered] @{
     Name       = 'Group Policy Administrative Permissions'
-    Enabled    = $true
+    Enabled    = $false
     Action     = $null
     Data       = $null
     Execute    = {

Private/Invoke.GPOZaurrPermissionsRead.ps1

@@ -1,6 +1,6 @@
 $GPOZaurrPermissionsRead = [ordered] @{
     Name       = 'Group Policy Authenticated Users Permissions'
-    Enabled    = $true
+    Enabled    = $false
     Action     = $null
     Data       = $null
     Execute    = {

Private/Invoke.GPOZaurrPermissionsRoot.ps1

@@ -1,6 +1,6 @@
 $GPOZaurrPermissionsRoot = [ordered] @{
     Name       = 'Group Policies Root Permissions'
-    Enabled    = $true
+    Enabled    = $false
     Action     = $null
     Data       = $null
     Execute    = {

Private/Invoke.GPOZaurrPermissionsUnknown.ps1

@@ -1,6 +1,6 @@
 $GPOZaurrPermissionsUnknown = [ordered] @{
     Name       = 'Group Policy Unknown Permissions'
-    Enabled    = $true
+    Enabled    = $false
     Action     = $null
     Data       = $null
     Execute    = {

Private/New-HTMLReportAll.ps1

@@ -0,0 +1,50 @@
+function New-HTMLReportAll {
+    [CmdletBinding()]
+    param(
+        [string] $FilePath,
+        [switch] $Online,
+        [switch] $HideHTML,
+        [Array] $Type
+    )
+    # Standard reports as requested
+    Write-Color -Text '[i]', '[HTML ] ', "Generating HTML report ($FilePath)" -Color Yellow, DarkGray, Yellow
+    New-HTML -Author 'Przemysław Kłys @ Evotec' -TitleText 'GPOZaurr Report' {
+        New-HTMLTabStyle -BorderRadius 0px -TextTransform capitalize -BackgroundColorActive SlateGrey
+        New-HTMLSectionStyle -BorderRadius 0px -HeaderBackGroundColor Grey -RemoveShadow
+        New-HTMLPanelStyle -BorderRadius 0px
+        New-HTMLTableOption -DataStore JavaScript -BoolAsString -ArrayJoinString ', ' -ArrayJoin
+
+        New-HTMLHeader {
+            New-HTMLSection -Invisible {
+                New-HTMLSection {
+                    New-HTMLText -Text "Report generated on $(Get-Date)" -Color Blue
+                } -JustifyContent flex-start -Invisible
+                New-HTMLSection {
+                    New-HTMLText -Text "GPOZaurr - $($Script:Reporting['Version'])" -Color Blue
+                } -JustifyContent flex-end -Invisible
+            }
+        }
+
+        if ($Type.Count -eq 1) {
+            foreach ($T in $Script:GPOConfiguration.Keys) {
+                if ($Script:GPOConfiguration[$T].Enabled -eq $true) {
+                    if ($Script:GPOConfiguration[$T]['Summary']) {
+                        $Script:Reporting[$T]['Summary'] = Invoke-Command -ScriptBlock $Script:GPOConfiguration[$T]['Summary']
+                    }
+                    & $Script:GPOConfiguration[$T]['Solution']
+                }
+            }
+        } else {
+            foreach ($T in $Script:GPOConfiguration.Keys) {
+                if ($Script:GPOConfiguration[$T].Enabled -eq $true) {
+                    if ($Script:GPOConfiguration[$T]['Summary']) {
+                        $Script:Reporting[$T]['Summary'] = Invoke-Command -ScriptBlock $Script:GPOConfiguration[$T]['Summary']
+                    }
+                    New-HTMLTab -Name $Script:GPOConfiguration[$T]['Name'] {
+                        & $Script:GPOConfiguration[$T]['Solution']
+                    }
+                }
+            }
+        }
+    } -Online:$Online.IsPresent -ShowHTML:(-not $HideHTML) -FilePath $FilePath
+}

Private/New-HTMLReportWithSplit.ps1

@@ -0,0 +1,61 @@
+function New-HTMLReportWithSplit {
+    [cmdletBinding()]
+    param(
+        [string] $FilePath,
+        [switch] $Online,
+        [switch] $HideHTML,
+        [string] $CurrentReport
+    )
+
+    # Split reports into multiple files for easier viewing
+    $DateName = $(Get-Date -f yyyy-MM-dd_HHmmss)
+    $FileName = [io.path]::GetFileNameWithoutExtension($FilePath)
+    $DirectoryName = [io.path]::GetDirectoryName($FilePath)
+    foreach ($T in $Script:GPOConfiguration.Keys) {
+        $NewFileName = $FileName + '_' + $T + "_" + $DateName + '.html'
+        $FilePath = [io.path]::Combine($DirectoryName, $NewFileName)
+
+        # we execute only if enabled and current report not given which means there's a single report to run
+        # or if current report is given and it matches the current report type which works for split reprots
+        if ($Script:GPOConfiguration[$T].Enabled -eq $true -and ((-not $CurrentReport) -or ($CurrentReport -and $CurrentReport -eq $T))) {
+            Write-Color -Text '[i]', '[HTML ] ', "Generating HTML report ($FilePath) for $T with split reports" -Color Yellow, DarkGray, Yellow
+            New-HTML -Author 'Przemysław Kłys' -TitleText 'GPOZaurr Report' {
+                New-HTMLTabStyle -BorderRadius 0px -TextTransform capitalize -BackgroundColorActive SlateGrey
+                New-HTMLSectionStyle -BorderRadius 0px -HeaderBackGroundColor Grey -RemoveShadow
+                New-HTMLPanelStyle -BorderRadius 0px
+                New-HTMLTableOption -DataStore JavaScript -BoolAsString -ArrayJoinString ', ' -ArrayJoin
+
+                New-HTMLHeader {
+                    New-HTMLSection -Invisible {
+                        New-HTMLSection {
+                            New-HTMLText -Text "Report generated on $(Get-Date)" -Color Blue
+                        } -JustifyContent flex-start -Invisible
+                        New-HTMLSection {
+                            New-HTMLText -Text "GPOZaurr - $($Script:Reporting['Version'])" -Color Blue
+                        } -JustifyContent flex-end -Invisible
+                    }
+                }
+
+                # if ($Type.Count -eq 1) {
+                #     foreach ($T in $Script:GPOConfiguration.Keys) {
+                #         if ($Script:GPOConfiguration[$T].Enabled -eq $true) {
+                #             if ($Script:GPOConfiguration[$T]['Summary']) {
+                #                 $Script:Reporting[$T]['Summary'] = Invoke-Command -ScriptBlock $Script:GPOConfiguration[$T]['Summary']
+                #             }
+                #             & $Script:GPOConfiguration[$T]['Solution']
+                #         }
+                #     }
+                # } else {
+
+                if ($Script:GPOConfiguration[$T]['Summary']) {
+                    $Script:Reporting[$T]['Summary'] = Invoke-Command -ScriptBlock $Script:GPOConfiguration[$T]['Summary']
+                }
+                New-HTMLTab -Name $Script:GPOConfiguration[$T]['Name'] {
+                    & $Script:GPOConfiguration[$T]['Solution']
+                }
+
+                # }
+            } -Online:$Online.IsPresent -ShowHTML:(-not $HideHTML) -FilePath $FilePath
+        }
+    }
+}

Public/Export-GPOZaurrContent.ps1

@@ -0,0 +1,43 @@
+function Export-GPOZaurrContent {
+    <#
+    .SYNOPSIS
+    Saves GPOs to XML or HTML files.
+
+    .DESCRIPTION
+    Saves GPOs to XML or HTML files.
+
+    .PARAMETER FolderOutput
+    The folder where the GPOs will be saved.
+
+    .PARAMETER ReportType
+    The type of report to generate. Valid values are XML or HTML. Default is XML.
+
+    .EXAMPLE
+    An example
+
+    .NOTES
+    General notes
+    #>
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory)][alias('Path')][string] $FolderOutput,
+        [ValidateSet('XML', 'HTML')][string] $ReportType = 'XML'
+    )
+    if ($FolderOutput) {
+        if (-not (Test-Path -LiteralPath $FolderOutput)) {
+            $null = New-Item -Path $FolderOutput -ItemType Directory -Force
+        }
+        $Forest = Get-ADForest
+        $Count = 0
+        foreach ($Domain in $Forest.Domains) {
+            $GPOs = Get-GPO -All -Domain $Domain
+            foreach ($GPO in $GPOS) {
+                $Count++
+                Write-Verbose -Message "Export-GPOZaurr - Exporting ($Count / $($GPOs.Count)) - $($GPO.DisplayName) to $ReportTypeF"
+                $Name = "$($GPO.DomainName)_$($GPO.Id)_$($GPO.DisplayName).xml".Replace(" ", "_").Replace("|", "_")
+                $FullName = [io.path]::Combine($GPOOutput, $Name)
+                Get-GPOReport -Guid $GPO.Id -Domain $GPO.DomainName -ReportType $ReportType -Path $FullName
+            }
+        }
+    }
+}

Public/Get-GPOZaurrPermissionConsistency.ps1

@@ -95,7 +95,7 @@
                 }
                 $Object['Owner'] = $_.Owner           # : EVOTEC\Enterprise Admins
                 $Object['Path'] = $_.Path
-                $Object['SysVolPath '] = $SysvolPath
+                $Object['SysVolPath'] = $SysvolPath
                 $Object['Id       '] = $_.Id              # : 8a7bc515-d7fd-4d1f-90b8-e47c15f89295
                 $Object['GpoStatus'] = $_.GpoStatus       # : AllSettingsEnabled
                 $Object['Description'] = $_.Description     # :

Public/Invoke-GPOZaurr.ps1

@@ -185,110 +185,34 @@
             $TimeEndGPOList = Stop-TimeLog -Time $TimeLogGPOList -Option OneLiner
             $Script:Reporting[$T]['Time'] = $TimeEndGPOList
             Write-Color -Text '[i]', '[End  ] ', $($Script:GPOConfiguration[$T]['Name']), " [Time to execute: $TimeEndGPOList]" -Color Yellow, DarkGray, Yellow, DarkGray
-        }
-    }
 
-    # Generate pretty HTML
-    $TimeLogHTML = Start-TimeLog
-    if (-not $FilePath) {
-        $FilePath = Get-FileName -Extension 'html' -Temporary
-    }
-    if ($SplitReports -and $Type.Count -gt 1) {
-        # Split reports into multiple files for easier viewing
-        $DateName = $(Get-Date -f yyyy-MM-dd_HHmmss)
-        $FileName = [io.path]::GetFileNameWithoutExtension($FilePath)
-        $DirectoryName = [io.path]::GetDirectoryName($FilePath)
-        foreach ($T in $Script:GPOConfiguration.Keys) {
-            $NewFileName = $FileName + '_' + $T + "_" + $DateName + '.html'
-            $FilePath = [io.path]::Combine($DirectoryName, $NewFileName)
-
-            if ($Script:GPOConfiguration[$T].Enabled -eq $true) {
-                Write-Color -Text '[i]', '[HTML ] ', "Generating HTML report ($FilePath) for $T with split reports" -Color Yellow, DarkGray, Yellow
-                New-HTML -Author 'Przemysław Kłys' -TitleText 'GPOZaurr Report' {
-                    New-HTMLTabStyle -BorderRadius 0px -TextTransform capitalize -BackgroundColorActive SlateGrey
-                    New-HTMLSectionStyle -BorderRadius 0px -HeaderBackGroundColor Grey -RemoveShadow
-                    New-HTMLPanelStyle -BorderRadius 0px
-                    New-HTMLTableOption -DataStore JavaScript -BoolAsString -ArrayJoinString ', ' -ArrayJoin
-
-                    New-HTMLHeader {
-                        New-HTMLSection -Invisible {
-                            New-HTMLSection {
-                                New-HTMLText -Text "Report generated on $(Get-Date)" -Color Blue
-                            } -JustifyContent flex-start -Invisible
-                            New-HTMLSection {
-                                New-HTMLText -Text "GPOZaurr - $($Script:Reporting['Version'])" -Color Blue
-                            } -JustifyContent flex-end -Invisible
-                        }
-                    }
-
-                    # if ($Type.Count -eq 1) {
-                    #     foreach ($T in $Script:GPOConfiguration.Keys) {
-                    #         if ($Script:GPOConfiguration[$T].Enabled -eq $true) {
-                    #             if ($Script:GPOConfiguration[$T]['Summary']) {
-                    #                 $Script:Reporting[$T]['Summary'] = Invoke-Command -ScriptBlock $Script:GPOConfiguration[$T]['Summary']
-                    #             }
-                    #             & $Script:GPOConfiguration[$T]['Solution']
-                    #         }
-                    #     }
-                    # } else {
-
-                    if ($Script:GPOConfiguration[$T]['Summary']) {
-                        $Script:Reporting[$T]['Summary'] = Invoke-Command -ScriptBlock $Script:GPOConfiguration[$T]['Summary']
-                    }
-                    New-HTMLTab -Name $Script:GPOConfiguration[$T]['Name'] {
-                        & $Script:GPOConfiguration[$T]['Solution']
-                    }
-
-                    # }
-                } -Online:$Online.IsPresent -ShowHTML:(-not $HideHTML) -FilePath $FilePath
+            if ($SplitReports) {
+                $TimeLogHTML = Start-TimeLog
+                New-HTMLReportWithSplit -FilePath $FilePath -Online:$Online -HideHTML:$HideHTML -CurrentReport $T
+                $TimeLogEndHTML = Stop-TimeLog -Time $TimeLogHTML -Option OneLiner
+                Write-Color -Text '[i]', '[HTML ] ', 'Generating HTML report', " [Time to execute: $TimeLogEndHTML]" -Color Yellow, DarkGray, Yellow, DarkGray
             }
         }
-    } else {
-        # Standard reports as requested
-        Write-Color -Text '[i]', '[HTML ] ', "Generating HTML report ($FilePath)" -Color Yellow, DarkGray, Yellow
-        New-HTML -Author 'Przemysław Kłys' -TitleText 'GPOZaurr Report' {
-            New-HTMLTabStyle -BorderRadius 0px -TextTransform capitalize -BackgroundColorActive SlateGrey
-            New-HTMLSectionStyle -BorderRadius 0px -HeaderBackGroundColor Grey -RemoveShadow
-            New-HTMLPanelStyle -BorderRadius 0px
-            New-HTMLTableOption -DataStore JavaScript -BoolAsString -ArrayJoinString ', ' -ArrayJoin
-
-            New-HTMLHeader {
-                New-HTMLSection -Invisible {
-                    New-HTMLSection {
-                        New-HTMLText -Text "Report generated on $(Get-Date)" -Color Blue
-                    } -JustifyContent flex-start -Invisible
-                    New-HTMLSection {
-                        New-HTMLText -Text "GPOZaurr - $($Script:Reporting['Version'])" -Color Blue
-                    } -JustifyContent flex-end -Invisible
-                }
-            }
-
-            if ($Type.Count -eq 1) {
-                foreach ($T in $Script:GPOConfiguration.Keys) {
-                    if ($Script:GPOConfiguration[$T].Enabled -eq $true) {
-                        if ($Script:GPOConfiguration[$T]['Summary']) {
-                            $Script:Reporting[$T]['Summary'] = Invoke-Command -ScriptBlock $Script:GPOConfiguration[$T]['Summary']
-                        }
-                        & $Script:GPOConfiguration[$T]['Solution']
-                    }
-                }
-            } else {
-                foreach ($T in $Script:GPOConfiguration.Keys) {
-                    if ($Script:GPOConfiguration[$T].Enabled -eq $true) {
-                        if ($Script:GPOConfiguration[$T]['Summary']) {
-                            $Script:Reporting[$T]['Summary'] = Invoke-Command -ScriptBlock $Script:GPOConfiguration[$T]['Summary']
-                        }
-                        New-HTMLTab -Name $Script:GPOConfiguration[$T]['Name'] {
-                            & $Script:GPOConfiguration[$T]['Solution']
-                        }
-                    }
-                }
-            }
-        } -Online:$Online.IsPresent -ShowHTML:(-not $HideHTML) -FilePath $FilePath
     }
 
-    $TimeLogEndHTML = Stop-TimeLog -Time $TimeLogHTML -Option OneLiner
-    Write-Color -Text '[i]', '[HTML ] ', 'Generating HTML report', " [Time to execute: $TimeLogEndHTML]" -Color Yellow, DarkGray, Yellow, DarkGray
+    if ( -not $SplitReports) {
+        # Generate pretty HTML
+        $TimeLogHTML = Start-TimeLog
+        if (-not $FilePath) {
+            $FilePath = Get-FileName -Extension 'html' -Temporary
+        }
+
+        # Split reports are handled above so we skip if this was set
+        if ($null -eq $Type -or $Type.Count -gt 1) {
+            New-HTMLReportAll -FilePath $FilePath -Online:$Online -HideHTML:$HideHTML -Type $Type
+        } else {
+            New-HTMLReportWithSplit -FilePath $FilePath -Online:$Online -HideHTML:$HideHTML
+        }
+
+
+        $TimeLogEndHTML = Stop-TimeLog -Time $TimeLogHTML -Option OneLiner
+        Write-Color -Text '[i]', '[HTML ] ', 'Generating HTML report', " [Time to execute: $TimeLogEndHTML]" -Color Yellow, DarkGray, Yellow, DarkGray
+    }
     if ($PassThru) {
         $Script:Reporting
     }