diff --git a/CHAMP.ps1 b/CHAMP.ps1 index a2bf0ba..92252e3 100644 --- a/CHAMP.ps1 +++ b/CHAMP.ps1 @@ -1317,12 +1317,12 @@ $Form1.FormBorderStyle = [System.Windows.Forms.FormBorderStyle]::FixedDialog $Form1.MaximizeBox = $false $Form1.Name = "Form1" $Form1.StartPosition = [System.Windows.Forms.FormStartPosition]::CenterParent -$Form1.Text = "CHAMP - 2024.09.01" +$Form1.Text = "CHAMP - 20241231" Function preflight () { $preflightCounter = [int] 0 $preflightDependancies = "" Write-Host "Running Pre-Flight checks...`n" - $currentVersion = "2024.09.01" + $currentVersion = "20241231" $version = Invoke-WebRequest -URI https://git.racooncity.org/brotoskyj/CHAMP/raw/branch/master/version.txt | Select-Object -ExpandProperty Content Write-Host "Version Check:" Write-Host "Local Version: $currentVersion" @@ -1348,7 +1348,7 @@ Function preflight () { $preflightCounter++ } Start-Sleep 1 - if ( $preflightCounter -eq 1 ) { + if ( $preflightCounter -eq 2 ) { Write-Host -ForegroundColor "Green" "Pre-Flight Checks are a go... Launching CHAMP" Start-Sleep 1 $devFlag = 0 @@ -2177,7 +2177,19 @@ function geoLocationForm() { $countryTextBox.Location = New-Object System.Drawing.Point(275, 60) $countryTextLabel = New-Object System.Windows.Forms.Label $countryTextLabel.Text = "Country: " - $countryTextLabel.Location = New-Object System.Drawing.Size(225, 60) + $countryTextLabel.Location = New-Object System.Drawing.Point(225, 60) + $stateTextBox = New-Object System.Windows.Forms.TextBox + $stateTextBox.Size = New-Object System.Drawing.Size(165, 35) + $stateTextBox.Location = New-Object System.Drawing.Point(275,100) + $stateTextLabel = New-Object System.Windows.Forms.Label + $stateTextLabel.Text = "State:" + $stateTextLabel.Location = New-Object System.Drawing.Point(225, 100) + $cityTextBox = New-Object System.Windows.Forms.TextBox + $cityTextBox.Size = New-Object System.Drawing.Size(165, 35) + $cityTextBox.Location = New-Object System.Drawing.Point(275,140) + $cityTextLabel = New-Object System.Windows.Forms.Label + $cityTextLabel.Text = "City:" + $cityTextLabel.Location = New-Object System.Drawing.Point(225, 140) $ipLocationSearchButton = New-Object System.Windows.Forms.Button $ipLocationSearchButton.Size = New-Object System.Drawing.Size(50, 23) $ipLocationSearchButton.Location = New-Object System.Drawing.Size(10, 75) @@ -2213,6 +2225,9 @@ function geoLocationForm() { $response = Invoke-RestMethod -Method GET -URI "http://ip-api.com/json/$ipToSearch" $ispTextBox.Text = $response.isp $countryTextBox.Text = $response.country + $stateTextBox.Text = $response.regionName + $cityTextBox.Text = $response.city + } $geoLocationFormBox.ShowDialog()