Skip to content

Commit 9d96444

Browse files
author
haraldpfirmann
committed
Scripts modified
1 parent 5584d56 commit 9d96444

15 files changed

+23
-32
lines changed

‎ActiveDirectory/Computers/Get-ADComputerProperties.ps1

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ param(
5454
[PSCredential]$DomainAccount,
5555
[Parameter(ParameterSetName = "Local or Remote DC")]
5656
[Parameter(ParameterSetName = "Remote Jumphost")]
57-
[string[]]$Properties="Name,DistinguishedName,DNSHostName,Enabled,Description,IPv4Address,IPv6Address,LastBadPasswordAttempt,Location,OperatingSystem,SAMAccountName",
57+
[ValidateSet('*','Name','DistinguishedName','DNSHostName','Enabled','Description','IPv4Address','IPv6Address','LastLogonDate','LastBadPasswordAttempt','SID','Location','SAMAccountName','OperatingSystem','OperatingSystemServicePack','CanonicalName','AccountExpires')]
58+
[string[]]$Properties = @('Name','DistinguishedName','DNSHostName','Enabled','Description','IPv4Address','IPv6Address','LastBadPasswordAttempt','Location','OperatingSystem','SAMAccountName'),
5859
[Parameter(ParameterSetName = "Local or Remote DC")]
5960
[Parameter(ParameterSetName = "Remote Jumphost")]
6061
[string]$DomainName,
@@ -71,7 +72,7 @@ param(
7172
Import-Module ActiveDirectory
7273

7374
try{
74-
[string]$Script:sam=$Computername
75+
[string]$Script:sam = $Computername
7576
if(-not $Script:sam.EndsWith('$')){
7677
$Script:sam += '$'
7778
}

‎ActiveDirectory/Computers/Set-ADComputerStatus.ps1

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ param(
7171

7272
Import-Module ActiveDirectory
7373

74-
#Clear
75-
#$ErrorActionPreference='Stop'
76-
7774
try{
7875
$Script:Domain
7976
$Script:Cmp

‎ActiveDirectory/Groups/Get-ADGroupMembers.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ try{
130130
$cmdArgs = @{'ErrorAction' = 'Stop'
131131
'Server' = $Script:Domain.PDCEmulator
132132
'AuthType' = $AuthType
133-
'Filter' = {(SamAccountName -eq $GroupName) -or (DistinguishedName -eq $GroupName)}
133+
'Identity' = $GroupName
134134
'SearchBase' = $OUPath
135135
'SearchScope' = $SearchScope
136136
}

‎ActiveDirectory/Groups/Get-ADGroupProperties.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ param(
5454
[PSCredential]$DomainAccount,
5555
[Parameter(ParameterSetName = "Local or Remote DC")]
5656
[Parameter(ParameterSetName = "Remote Jumphost")]
57-
[string[]]$Properties="Name,Description,DistinguishedName,HomePage,SAMAccountName,SID",
57+
[ValidateSet('*','Name','Description','DistinguishedName','HomePage','SAMAccountName','SID','CN','GroupCategory','CanonicalName','GroupScope','Members','MemberOf')]
58+
[string[]]$Properties = @('Name','Description','DistinguishedName','HomePage','SAMAccountName','SID'),
5859
[Parameter(ParameterSetName = "Local or Remote DC")]
5960
[Parameter(ParameterSetName = "Remote Jumphost")]
6061
[string]$DomainName,

‎ActiveDirectory/Groups/Remove-ADGroup.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ try{
8383
$cmdArgs = @{'ErrorAction' = 'Stop'
8484
'Server' = $Domain.PDCEmulator
8585
'AuthType' = $AuthType
86-
'Filter' = {(SamAccountName -eq $GroupName) -or (DistinguishedName -eq $GroupName)}
86+
'Identity' = $GroupName
8787
'SearchBase' = $OUPath
8888
'SearchScope' = $SearchScope
8989
}

‎ActiveDirectory/Groups/Set-ADGroupProperties.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ try{
104104
$cmdArgs = @{'ErrorAction' = 'Stop'
105105
'Server' = $Domain.PDCEmulator
106106
'AuthType' = $AuthType
107-
'Filter' = {(SamAccountName -eq $GroupName) -or (DistinguishedName -eq $GroupName)}
107+
'Identity' = $GroupName
108108
'SearchBase' = $OUPath
109109
'SearchScope' = $SearchScope
110110
}

‎ActiveDirectory/Users/Get-ADUserProperties.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ param(
5454
[PSCredential]$DomainAccount,
5555
[Parameter(ParameterSetName = "Local or Remote DC")]
5656
[Parameter(ParameterSetName = "Remote Jumphost")]
57-
[string]$Properties="Name,GivenName,Surname,DisplayName,Description,Office,EmailAddress,OfficePhone,Title,Department,Company,StreetAddress,PostalCode,City,SAMAccountName",
57+
[ValidateSet('*','GivenName','Surname','DisplayName','DistinguishedName','Description','Enabled','Office','EmailAddress','OfficePhone','Title','Department','Company','StreetAddress','PostalCode','City','SAMAccountName','UserPrincipalName','MemberOf','LastLogonDate','LastBadPasswordAttempt','AccountExpirationDate','CanonicalName')]
58+
[string]$Properties = @('Name','GivenName','Surname','DisplayName','Description','Office','EmailAddress','OfficePhone','Title','Department','Company','StreetAddress','PostalCode','City','SAMAccountName'),
5859
[Parameter(ParameterSetName = "Local or Remote DC")]
5960
[Parameter(ParameterSetName = "Remote Jumphost")]
6061
[string]$DomainName,

‎ActiveDirectory/Users/New-ADUser.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ Import-Module ActiveDirectory
157157
try{
158158
$Script:User
159159
$Script:Domain
160-
$Script:Properties =@('GivenName','Surname','SAMAccountName','UserPrincipalname','Name','DisplayName','Description','EmailAddress', 'CannotChangePassword','PasswordNeverExpires' `
160+
$Script:Properties = @('GivenName','Surname','SAMAccountName','UserPrincipalname','Name','DisplayName','Description','EmailAddress', 'CannotChangePassword','PasswordNeverExpires' `
161161
,'Department','Company','PostalCode','City','StreetAddress','DistinguishedName')
162162

163163
[hashtable]$cmdArgs = @{'ErrorAction' = 'Stop'

‎ActiveDirectory/Users/Remove-ADServiceAccount.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ try{
6565
$Script:Srv
6666
$Script:Domain
6767

68-
[string]$Script:sam=$AccountName
68+
[string]$Script:sam = $AccountName
6969
if(-not $Script:sam.EndsWith('$')){
7070
# $Script:sam += '$'
7171
}

‎ActiveDirectory/Users/Reset-ADUserPassword.ps1

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,10 @@ param(
7777

7878
Import-Module ActiveDirectory
7979

80-
#Clear
81-
#$ErrorActionPreference='Stop'
8280
try{
8381
$Script:User
8482
$Script:Domain
85-
$Script:Properties =@('GivenName','Surname','SAMAccountName','UserPrincipalname','Name','DisplayName','Description','EmailAddress', 'CannotChangePassword','PasswordNeverExpires' `
83+
$Script:Properties = @('GivenName','Surname','SAMAccountName','UserPrincipalname','Name','DisplayName','Description','EmailAddress', 'CannotChangePassword','PasswordNeverExpires' `
8684
,'Department','Company','PostalCode','City','StreetAddress','DistinguishedName')
8785

8886
[hashtable]$cmdArgs = @{'ErrorAction' = 'Stop'

‎ActiveDirectory/Users/Set-ADUserProperties.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Import-Module ActiveDirectory
170170
try{
171171
$Script:User
172172
$Script:Domain
173-
$Script:Properties =@('GivenName','Surname','SAMAccountName','UserPrincipalname','Name','DisplayName','Description','EmailAddress', 'CannotChangePassword','PasswordNeverExpires' `
173+
$Script:Properties = @('GivenName','Surname','SAMAccountName','UserPrincipalname','Name','DisplayName','Description','EmailAddress', 'CannotChangePassword','PasswordNeverExpires' `
174174
,'Department','Company','PostalCode','City','StreetAddress','DistinguishedName')
175175

176176
[hashtable]$cmdArgs = @{'ErrorAction' = 'Stop'

‎ActiveDirectory/Users/Set-ADUserPropertiesDemo.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ Import-Module ActiveDirectory
164164
try{
165165
$Script:User
166166
$Script:Domain
167-
$Script:Properties =@('GivenName','Surname','SAMAccountName','UserPrincipalname','Name','DisplayName','Description','EmailAddress', 'CannotChangePassword','PasswordNeverExpires' `
167+
$Script:Properties = @('GivenName','Surname','SAMAccountName','UserPrincipalname','Name','DisplayName','Description','EmailAddress', 'CannotChangePassword','PasswordNeverExpires' `
168168
,'Department','Company','PostalCode','City','StreetAddress','DistinguishedName')
169169

170170
[hashtable]$cmdArgs = @{'ErrorAction' = 'Stop'

‎ActiveDirectory/Users/Set-ADUserStatus.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Import-Module ActiveDirectory
8080
try{
8181
$Script:Domain
8282
$Script:User
83-
$Script:Properties =@('GivenName','Surname','SAMAccountName','UserPrincipalname','Name','DisplayName','Description','EmailAddress', 'CannotChangePassword','PasswordNeverExpires' `
83+
$Script:Properties = @('GivenName','Surname','SAMAccountName','UserPrincipalname','Name','DisplayName','Description','EmailAddress', 'CannotChangePassword','PasswordNeverExpires' `
8484
,'Department','Company','PostalCode','City','StreetAddress','Enabled','DistinguishedName')
8585

8686
[hashtable]$cmdArgs = @{'ErrorAction' = 'Stop'

‎ActiveDirectory/_QUERY_/QUY_Get-ADUsers.ps1

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,13 @@ try{
8383
if($null -ne $DomainAccount){
8484
$cmdArgs.Add("Credential", $DomainAccount)
8585
}
86-
$Script:users = Get-ADUser @cmdArgs | Sort-Object -Property DisplayName
87-
88-
if($SRXEnv) {
89-
$SRXEnv.ResultList =@()
90-
$SRXEnv.ResultList2 =@()
91-
}
86+
$Script:users = Get-ADUser @cmdArgs | Sort-Object -Property DisplayName
87+
9288
if($null -ne $Script:users){
9389
foreach($itm in $users){
9490
if($SRXEnv) {
95-
$SRXEnv.ResultList += $itm.DistinguishedName # Value
96-
$SRXEnv.ResultList2 += "$($itm.DisplayName) ($($itm.SamAccountName))" # DisplayValue
91+
$SRXEnv.ResultList.Add($itm.DistinguishedName) # Value
92+
$SRXEnv.ResultList2.Add("$($itm.DisplayName) ($($itm.SamAccountName))") # DisplayValue
9793
}
9894
else{
9995
Write-Output "$($itm.DisplayName) ($($itm.SamAccountName))"

‎ActiveDirectory/_QUERY_/QUY_Get-ADUsersWithDefinedStatus.ps1

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,12 @@ try{
108108
$Script:users += Search-ADAccount @cmdArgs -AccountExpired `
109109
| Select-Object DistinguishedName, SamAccountName | Sort-Object -Property SamAccountName
110110
}
111-
if($SRXEnv) {
112-
$SRXEnv.ResultList =@()
113-
$SRXEnv.ResultList2 =@()
114-
}
111+
115112
if($null -ne $Script:users){
116113
foreach($itm in $users){
117114
if($SRXEnv) {
118-
$SRXEnv.ResultList += $itm.DistinguishedName # Value
119-
$SRXEnv.ResultList2 += $itm.SamAccountName # DisplayValue
115+
$SRXEnv.ResultList.Add($itm.DistinguishedName) # Value
116+
$SRXEnv.ResultList2.Add($itm.SamAccountName) # DisplayValue
120117
}
121118
else{
122119
Write-Output $itm.SamAccountName

0 commit comments

Comments
 (0)