diff --git a/GPOZaurr.psd1 b/GPOZaurr.psd1 index d0557f6..c8ce5d7 100644 --- a/GPOZaurr.psd1 +++ b/GPOZaurr.psd1 @@ -7,7 +7,7 @@ Description = 'Group Policy Eater is a PowerShell module that aims to gather information about Group Policies but also allows easy fixing for issues that you may expect finding in them.' FunctionsToExport = 'Add-GPOPermission', 'Add-GPOZaurrPermission', 'Backup-GPOZaurr', 'Get-GPOZaurr', 'Get-GPOZaurrAD', 'Get-GPOZaurrBackupInformation', 'Get-GPOZaurrFiles', 'Get-GPOZaurrLegacyFiles', 'Get-GPOZaurrLink', 'Get-GPOZaurrLinkSummary', 'Get-GPOZaurrOwner', 'Get-GPOZaurrPassword', 'Get-GPOZaurrPermission', 'Get-GPOZaurrPermissionConsistency', 'Get-GPOZaurrSysvol', 'Get-WMIFilter', 'Get-GPOZaurrWMI', 'Invoke-GPOZaurr', 'Invoke-GPOZaurrPermission', 'New-GPOZaurrWMI', 'Remove-GPOPermission', 'Remove-GPOZaurr', 'Remove-GPOZaurrLegacyFiles', 'Remove-GPOZaurrOrphanedSysvolFolders', 'Remove-GPOZaurrPermission', 'Remove-GPOZaurrWMI', 'Repair-GPOZaurrPermissionConsistency', 'Restore-GPOZaurr', 'Save-GPOZaurrFiles', 'Select-GPOTranslation', 'Set-GPOOwner', 'Set-GPOZaurrOwner' GUID = 'f7d4c9e4-0298-4f51-ad77-e8e3febebbde' - ModuleVersion = '0.0.47' + ModuleVersion = '0.0.48' PowerShellVersion = '5.1' PrivateData = @{ PSData = @{ @@ -17,11 +17,11 @@ } } RequiredModules = @{ - ModuleVersion = '0.0.155' + ModuleVersion = '0.0.158' ModuleName = 'PSSharedGoods' Guid = 'ee272aa8-baaa-4edf-9f45-b6d6f7d844fe' }, @{ - ModuleVersion = '0.0.58' + ModuleVersion = '0.0.63' ModuleName = 'ADEssentials' Guid = '9fc9fd61-7f11-4f4b-a527-084086f1905f' }, 'ActiveDirectory', 'GroupPolicy', 'CimCmdlets', 'Microsoft.PowerShell.Management', 'Microsoft.PowerShell.Utility' diff --git a/Private/Get-XMLStandard.ps1 b/Private/Get-XMLStandard.ps1 index f98d478..701e099 100644 --- a/Private/Get-XMLStandard.ps1 +++ b/Private/Get-XMLStandard.ps1 @@ -14,7 +14,7 @@ if ($ExtensionType) { $GPOSettingTypeSplit = ($ExtensionType.type -split ':') try { - $KeysToLoop = $ExtensionType | Get-Member -MemberType Properties -ErrorAction Stop | Where-Object { $_.Name -notin 'type', $GPOSettingTypeSplit[0] } + $KeysToLoop = $ExtensionType | Get-Member -MemberType Properties -ErrorAction Stop | Where-Object { $_.Name -notin 'type', $GPOSettingTypeSplit[0] -and $_.Name -notin @('Blocked') } } catch { Write-Warning "Get-XMLStandard - things went sideways $($_.Exception.Message)" continue diff --git a/Public/Invoke-GPOZaurr.ps1 b/Public/Invoke-GPOZaurr.ps1 index af1ea87..3b965c2 100644 --- a/Public/Invoke-GPOZaurr.ps1 +++ b/Public/Invoke-GPOZaurr.ps1 @@ -70,6 +70,7 @@ } $Output = [ordered] @{} $OutputByGPO = [ordered] @{} + $TranslatedOutput = [ordered] @{} foreach ($GPO in $GPOs) { if ($GPOPath) { $GPOOutput = $GPO.GPOOutput @@ -94,13 +95,13 @@ } $OutputByGPO[$D.DomainName][$D.DisplayName].Add($D) } + } if ($NoTranslation) { if ($OutputType -contains 'Object') { - $OutputByGPO + $Output } } else { - $TranslatedOutput = [ordered] @{} foreach ($Report in $Type) { $Category = $Script:GPODitionary[$Report]['Category'] $Settings = $Script:GPODitionary[$Report]['Settings'] @@ -112,15 +113,16 @@ # if (-not $TranslatedOutput[$Category][$Settings]) { # $TranslatedOutput[$Category][$Settings] = [ordered] @{} # } - $TranslatedOutput[$Report] = Invoke-GPOTranslation -InputData $Output -Category $Category -Settings $Settings -Report $Report + $TranslatedOutput[$Report] = Invoke-GPOTranslationOld -InputData $Output -Category $Category -Settings $Settings -Report $Report #} } if ($OutputType -contains 'Object') { $TranslatedOutput } } + if ($NoTranslation) { - $SingleSource = $OutputType + $SingleSource = $Output } else { $SingleSource = $TranslatedOutput } @@ -173,6 +175,7 @@ Invoke-Item -Path $FilePathExcel } } + } [scriptblock] $SourcesAutoCompleter = { diff --git a/README.md b/README.md index e512634..f956f61 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,8 @@ That's it. Whenever there's a new version, you run the command, and you can enjo ## Changelog +- 0.0.48 - Unreleased + - 0.0.47 - 29.06.2020 - Update to `Get-GPOZaurrAD` for better error reporting - Updates to `Invoke-GPOZaurr` - still work in progress