From 0be48fb9d97baabf76356e5f06778abc00d9d748 Mon Sep 17 00:00:00 2001
From: brotoskyj <jbrotosky@gmail.com>
Date: Mon, 30 Dec 2024 23:30:22 -0500
Subject: [PATCH] Added State and City to IP Geolocation API

---
 CHAMP.ps1 | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/CHAMP.ps1 b/CHAMP.ps1
index 05bbfad..a2bf0ba 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 - 20241231"
+$Form1.Text = "CHAMP - 2024.09.01"
 Function preflight () {
     $preflightCounter = [int] 0
     $preflightDependancies = ""
     Write-Host "Running Pre-Flight checks...`n"
-    $currentVersion = "20241231"
+    $currentVersion = "2024.09.01"
     $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 2 ) {
+    if ( $preflightCounter -eq 1 ) {
         Write-Host -ForegroundColor "Green" "Pre-Flight Checks are a go... Launching CHAMP"
         Start-Sleep 1
         $devFlag = 0
@@ -2177,19 +2177,7 @@ 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.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)
+    $countryTextLabel.Location = New-Object System.Drawing.Size(225, 60)
     $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)
@@ -2222,9 +2210,9 @@ function geoLocationForm() {
         $ispTextBox.Clear()
         $countryTextBox.Clear()
         $ipToSearch = $ipSearchBox.Text
-        $response = Invoke-RestMethod -Method GET -URI "https://api.iplocation.net/?ip=$ipToSearch"
-        $ispTextBox.Text = $response.ISP
-        $countryTextBox.Text = $response.Country_Name
+        $response = Invoke-RestMethod -Method GET -URI "http://ip-api.com/json/$ipToSearch"
+        $ispTextBox.Text = $response.isp
+        $countryTextBox.Text = $response.country
     }
     $geoLocationFormBox.ShowDialog()