mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-15 02:09:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/3.2'

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-07-24 16:33:37 +01:00
commit 4059e1f84c
1 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/pocketmine/utils/Utils.php
View File

@ -136,42 +136,32 @@ class Utils{
return Utils::$ip; return Utils::$ip;
} }
do{ $ip = Utils::getURL("http://api.ipify.org/");
$ip = Utils::getURL("http://api.ipify.org/"); if($ip !== false){
if($ip !== false){ return Utils::$ip = $ip;
Utils::$ip = $ip; }
break;
}
$ip = Utils::getURL("http://checkip.dyndns.org/"); $ip = Utils::getURL("http://checkip.dyndns.org/");
if($ip !== false and preg_match('#Current IP Address\: ([0-9a-fA-F\:\.]*)#', trim(strip_tags($ip)), $matches) > 0){ if($ip !== false and preg_match('#Current IP Address\: ([0-9a-fA-F\:\.]*)#', trim(strip_tags($ip)), $matches) > 0){
Utils::$ip = $matches[1]; return Utils::$ip = $matches[1];
break; }
}
$ip = Utils::getURL("http://www.checkip.org/"); $ip = Utils::getURL("http://www.checkip.org/");
if($ip !== false and preg_match('#">([0-9a-fA-F\:\.]*)</span>#', $ip, $matches) > 0){ if($ip !== false and preg_match('#">([0-9a-fA-F\:\.]*)</span>#', $ip, $matches) > 0){
Utils::$ip = $matches[1]; return Utils::$ip = $matches[1];
break; }
}
$ip = Utils::getURL("http://checkmyip.org/"); $ip = Utils::getURL("http://checkmyip.org/");
if($ip !== false and preg_match('#Your IP address is ([0-9a-fA-F\:\.]*)#', $ip, $matches) > 0){ if($ip !== false and preg_match('#Your IP address is ([0-9a-fA-F\:\.]*)#', $ip, $matches) > 0){
Utils::$ip = $matches[1]; return Utils::$ip = $matches[1];
break; }
}
$ip = Utils::getURL("http://ifconfig.me/ip"); $ip = Utils::getURL("http://ifconfig.me/ip");
if($ip !== false and trim($ip) != ""){ if($ip !== false and trim($ip) != ""){
Utils::$ip = trim($ip); return Utils::$ip = trim($ip);
break; }
}
return false; return false;
}while(false);
return Utils::$ip;
} }
/** /**