beenull/speedtest
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into docker

Browse source
This commit is contained in:
adolfintel 2019-01-11 11:57:59 +01:00
parent a2bc9826d1 53ca58db03
commit b157d37442
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
getIP.php
View file

@ -53,22 +53,27 @@ if (isset($_GET["isp"])) {
$json = file_get_contents("https://ipinfo.io/" . $ip . "/json"); $json = file_get_contents("https://ipinfo.io/" . $ip . "/json");
$details = json_decode($json, true); $details = json_decode($json, true);
$rawIspInfo=$details; $rawIspInfo=$details;
if (array_key_exists("org", $details)) if (array_key_exists("org", $details)){
$isp .= $details["org"]; $isp .= $details["org"];
else $isp=preg_replace("/AS\d{1,}\s/","",$isp); //Remove AS##### from ISP name, if present
}else{
$isp .= "Unknown ISP"; $isp .= "Unknown ISP";
if (array_key_exists("country", $details)) }
$isp .= ", " . $details["country"]; if (array_key_exists("country", $details)){
$isp .= ", " . $details["country"];
}
$clientLoc = NULL; $clientLoc = NULL;
$serverLoc = NULL; $serverLoc = NULL;
if (array_key_exists("loc", $details)) if (array_key_exists("loc", $details)){
$clientLoc = $details["loc"]; $clientLoc = $details["loc"];
}
if (isset($_GET["distance"])) { if (isset($_GET["distance"])) {
if ($clientLoc) { if ($clientLoc) {
$json = file_get_contents("https://ipinfo.io/json"); $json = file_get_contents("https://ipinfo.io/json");
$details = json_decode($json, true); $details = json_decode($json, true);
if (array_key_exists("loc", $details)) if (array_key_exists("loc", $details)){
$serverLoc = $details["loc"]; $serverLoc = $details["loc"];
}
if ($serverLoc) { if ($serverLoc) {
try { try {
$clientLoc = explode(",", $clientLoc); $clientLoc = explode(",", $clientLoc);