Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Develop Branch Into Production #1

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Merge Develop Branch Into Production #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fdc6288
adding gitignore as well as royalts form updates
Dec 28, 2018
f738ca8
added quick and dirty script to combine files
Dec 28, 2018
00dc870
reformatted structure
armentpau Dec 29, 2018
a0c0f6a
added updates
Dec 31, 2018
e073810
added updates from feedback from RoyalTS
Dec 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

RoyalTSDynamicForm/Globals\.TempPoint\.ps1

RoyalTSDynamicForm/MainForm\.TempPoint\.psf

RoyalTSDynamicForm/OU Selector\.TempPoint\.psf
1 change: 1 addition & 0 deletions Production/AD Servers - Windows PowerShell.rdfe
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions RoyalTSDynamicForm/Globals.TempPoint.ps1
View file
Open in desktop

This file was deleted.

555 changes: 0 additions & 555 deletions RoyalTSDynamicForm/MainForm.TempPoint.psf
View file
Open in desktop

This file was deleted.

679 changes: 0 additions & 679 deletions RoyalTSDynamicForm/MainForm.psf
View file
Open in desktop

This file was deleted.

2,131 changes: 2,131 additions & 0 deletions SourceData/Exported/RoyalTSDynamicForm.Export.ps1
View file
Open in desktop

Large diffs are not rendered by default.

2,286 changes: 2,286 additions & 0 deletions SourceData/FinalizedFile/ExportedCompleteFile.ps1
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions SourceData/HelperFunctions/FinalFileBuilder.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
$FormFile = "$((Get-Item $($PSScriptRoot)).parent.fullname)\Exported"
$footer = "$((Get-Item $($PSScriptRoot)).parent.fullname)\RoyalTS"
$destination = "$((Get-Item $($PSScriptRoot)).parent.fullname)\FinalizedFile"

$tempData = get-content "$($formfile)\RoyalTSDynamicForm.Export.ps1"
$tempData += "`r`n"
$tempData += get-content "$($footer)\RoyalTSDynamicConnectionFooter.ps1"
$tempData | out-file "$($destination)\ExportedCompleteFile.ps1" -encoding ascii

Write-Host $FormFile
write-host $footer
34 changes: 17 additions & 17 deletions ...ple/RoyalTSCreateEnterpriseConnection.ps1 → ...ple/RoyalTSCreateEnterpriseConnection.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
Import-Module ActiveDirectory
[System.Collections.ArrayList]$array = @()
foreach ($computer in Get-ADComputer -SearchBase "ou=Enterprise Servers,dc=ahc,dc=root,dc=loc" -Filter * -SearchScope subtree -Properties canonicalname)
{
$array.add((
New-Object -TypeName System.Management.Automation.PSObject -Property @{
"Type" = "RemoteDesktopConnection";
"Name" = $computer.name;
"credentialName" = "949237a";
"Path" = $computer.canonicalname.replace("/$($computer.name)", "")
}
)) | Out-Null
}
#$array = $array | Sort-Object -Property name
$hash = @{ }
$hash.add("Objects", $array)
Import-Module ActiveDirectory
[System.Collections.ArrayList]$array = @()
foreach ($computer in Get-ADComputer -SearchBase "ou=Enterprise Servers,dc=ahc,dc=root,dc=loc" -Filter * -SearchScope subtree -Properties canonicalname)
{
$array.add((
New-Object -TypeName System.Management.Automation.PSObject -Property @{
"Type" = "RemoteDesktopConnection";
"Name" = $computer.name;
"credentialName" = "949237a";
"Path" = $computer.canonicalname.replace("/$($computer.name)", "")
}
)) | Out-Null
}
#$array = $array | Sort-Object -Property name
$hash = @{ }
$hash.add("Objects", $array)

$hash | ConvertTo-Json
226 changes: 113 additions & 113 deletions RoyalTS/RoyalTSDynamicConnectionFooter.ps1 → ...alTSDynamicConnectionFooter.TempPoint.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,114 +1,114 @@
Import-Module ActiveDirectory
[System.Collections.ArrayList]$array = @()
$script:ConfigFilePath = "$($env:APPDATA)\RoyalTSDynamicFolderCustomizer"
if ("$CustomProperty.ConfigFileName$" -ne '.ConfigFileName$' -and "$CustomProperty.ConfigFileName$" -ne "TODO")
{
$script:configFileName = "$CustomProperty.ConfigFileName$"
}
else
{
$script:configFileName = "settings.xml"
}
if (Test-Path "$($script:ConfigFilePath)\$($configFileName)")
{
$data = Import-Clixml -Path "$($script:ConfigFilePath)\$($configFileName)"
$filter = $data.filter
$searchScope = $data.searchscope
$server = $data.server
$searchBase = $data.searchbase
$credentialName = $data.credentialName
$portNumber = $data.portNumber
$connectionType = $data.connectionType
$useCimChecked = $data.useCimChecked
$useConsole = $data.adminConsole
if ($useCimChecked -like "Checked")
{
$useCim = "true"
}
else
{
$useCim = "false"
}
if ($useConsole -like "Checked")
{
$useadminConsole = "true"
}
else
{
$useadminConsole = "false"
}
foreach ($computer in Get-ADComputer -SearchBase $searchBase -Filter $filter -SearchScope $searchScope -Server $server -Properties canonicalname)
{
if ($connectionType -like "RemoteDesktopConnection")
{
$array.add((
New-Object -TypeName System.Management.Automation.PSObject -Property @{
"Type" = $connectionType;
"Port" = $portNumber
"Name" = $computer.name;
"ComputerName" = $computer.name;
"credentialName" = $credentialName;
"Path" = $computer.canonicalname.replace("/$($computer.name)", "");
"ConsoleSession" = $useadminConsole
}
)) | Out-Null
}
elseif ($connectionType -like "TerminalConnection*")
{
$array.add((
New-Object -TypeName System.Management.Automation.PSObject -Property @{
"Type" = "TerminalConnection";
"TerminalConnectionType" = $connectionType.replace("TerminalConnection - ", "")
"Port" = $portNumber
"Name" = $computer.name;
"ComputerName" = $computer.name;
"credentialName" = $credentialName;
"Path" = $computer.canonicalname.replace("/$($computer.name)", "");
}
)) | Out-Null
}
elseif ($connectionType -like "Windows*" -or $connectionType -like "TerminalServicesConnection")
{
$array.add((
New-Object -TypeName System.Management.Automation.PSObject -Property @{
"Type" = $connectionType;
"UseCIM" = $useCim;
"Name" = $computer.name;
"ComputerName" = $computer.name;
"credentialName" = $credentialName;
"Path" = $computer.canonicalname.replace("/$($computer.name)", "");
}
)) | Out-Null
}
elseif ([string]::IsNullOrEmpty($portNumber))
{
$array.add((
New-Object -TypeName System.Management.Automation.PSObject -Property @{
"Type" = $connectionType;
"Name" = $computer.name;
"ComputerName" = $computer.name;
"credentialName" = $credentialName;
"Path" = $computer.canonicalname.replace("/$($computer.name)", "");
}
)) | Out-Null
}
else
{
$array.add((
New-Object -TypeName System.Management.Automation.PSObject -Property @{
"Type" = $connectionType;
"Port" = $portNumber
"Name" = $computer.name;
"ComputerName" = $computer.name;
"credentialName" = $credentialName;
"Path" = $computer.canonicalname.replace("/$($computer.name)", "");
}
)) | Out-Null
}
}
$array = $array | Sort-Object -Property path
$hash = @{ }
$hash.add("Objects", $array)
$hash | ConvertTo-Json
Import-Module ActiveDirectory
[System.Collections.ArrayList]$array = @()
$script:ConfigFilePath = "$($env:APPDATA)\RoyalTSDynamicFolderCustomizer"
if ("$CustomProperty.ConfigFileName$" -ne '.ConfigFileName$' -and "$CustomProperty.ConfigFileName$" -ne "TODO")
{
$script:configFileName = "$CustomProperty.ConfigFileName$"
}
else
{
$script:configFileName = "settings.xml"
}
if (Test-Path "$($script:ConfigFilePath)\$($configFileName)")
{
$data = Import-Clixml -Path "$($script:ConfigFilePath)\$($configFileName)"
$filter = $data.filter
$searchScope = $data.searchscope
$server = $data.server
$searchBase = $data.searchbase
$credentialName = $data.credentialName
$portNumber = $data.portNumber
$connectionType = $data.connectionType
$useCimChecked = $data.useCimChecked
$useConsole = $data.adminConsole
if ($useCimChecked -like "Checked")
{
$useCim = "true"
}
else
{
$useCim = "false"
}
if ($useConsole -like "Checked")
{
$useadminConsole = "true"
}
else
{
$useadminConsole = "false"
}
foreach ($computer in Get-ADComputer -SearchBase $searchBase -Filter $filter -SearchScope $searchScope -Server $server -Properties canonicalname)
{
if ($connectionType -like "RemoteDesktopConnection")
{
$array.add((
New-Object -TypeName System.Management.Automation.PSObject -Property @{
"Type" = $connectionType;
"Port" = $portNumber
"Name" = $computer.name;
"ComputerName" = $computer.name;
"credentialName" = $credentialName;
"Path" = $computer.canonicalname.replace("/$($computer.name)", "");
"ConsoleSession" = $useadminConsole
}
)) | Out-Null
}
elseif ($connectionType -like "TerminalConnection*")
{
$array.add((
New-Object -TypeName System.Management.Automation.PSObject -Property @{
"Type" = "TerminalConnection";
"TerminalConnectionType" = $connectionType.replace("TerminalConnection - ", "")
"Port" = $portNumber
"Name" = $computer.name;
"ComputerName" = $computer.name;
"credentialName" = $credentialName;
"Path" = $computer.canonicalname.replace("/$($computer.name)", "");
}
)) | Out-Null
}
elseif ($connectionType -like "Windows*" -or $connectionType -like "TerminalServicesConnection")
{
$array.add((
New-Object -TypeName System.Management.Automation.PSObject -Property @{
"Type" = $connectionType;
"UseCIM" = $useCim;
"Name" = $computer.name;
"ComputerName" = $computer.name;
"credentialName" = $credentialName;
"Path" = $computer.canonicalname.replace("/$($computer.name)", "");
}
)) | Out-Null
}
elseif ([string]::IsNullOrEmpty($portNumber))
{
$array.add((
New-Object -TypeName System.Management.Automation.PSObject -Property @{
"Type" = $connectionType;
"Name" = $computer.name;
"ComputerName" = $computer.name;
"credentialName" = $credentialName;
"Path" = $computer.canonicalname.replace("/$($computer.name)", "");
}
)) | Out-Null
}
else
{
$array.add((
New-Object -TypeName System.Management.Automation.PSObject -Property @{
"Type" = $connectionType;
"Port" = $portNumber
"Name" = $computer.name;
"ComputerName" = $computer.name;
"credentialName" = $credentialName;
"Path" = $computer.canonicalname.replace("/$($computer.name)", "");
}
)) | Out-Null
}

}
$array = $array | Sort-Object -Property path
$hash = @{ }
$hash.add("Objects", $array)
$hash | ConvertTo-Json
}
Loading