Merge branch 'master' into docker

This commit is contained in:
dosse91 2018-02-17 13:05:50 +01:00
commit a562a560c4

View file

@ -10,6 +10,7 @@
} else { } else {
$ip=$_SERVER['REMOTE_ADDR']; $ip=$_SERVER['REMOTE_ADDR'];
} }
$ip=preg_replace("/^::ffff:/", "", $ip);
$isp=""; $isp="";
if(isset($_GET["isp"])){ if(isset($_GET["isp"])){
$json = file_get_contents("https://ipinfo.io/".$ip."/json"); $json = file_get_contents("https://ipinfo.io/".$ip."/json");