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

New statistics system

Browse Source
This commit is contained in:
Shoghi Cervantes
2015-05-19 20:49:30 +02:00
parent 36ddbf286d
commit cde2d39029
15 changed files with 175 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/utils/ReversePriorityQueue.php
View File

@ -14,7 +14,7 @@
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/

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

@ -32,6 +32,7 @@ class Utils{
public static $online = true;
public static $ip = false;
public static $os;
private static $serverUniqueId = null;
/**
* Generates an unique identifier to a callable
@ -78,6 +79,10 @@ class Utils{
* @return string
*/
public static function getServerUniqueId($extra = ""){
if(self::$serverUniqueId !== null){
return self::$serverUniqueId;
}
$machine = php_uname("a");
$machine .= file_exists("/proc/cpuinfo") ? implode(preg_grep("/model name/", file("/proc/cpuinfo"))) : "";
$machine .= sys_get_temp_dir();
@ -114,7 +119,7 @@ class Utils{
$data .= $ext . ":" . phpversion($ext);
}
return Utils::dataToUUID($machine, $data);
return self::$serverUniqueId = Utils::dataToUUID($machine, $data);
}
/**
@ -434,16 +439,17 @@ class Utils{
*
* @param $page
* @param int $timeout default 10
* @param array $extraHeaders
*
* @return bool|mixed
*/
public static function getURL($page, $timeout = 10){
public static function getURL($page, $timeout = 10, array $extraHeaders = []){
if(Utils::$online === false){
return false;
}
$ch = curl_init($page);
curl_setopt($ch, CURLOPT_HTTPHEADER, ["User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:12.0) Gecko/20100101 Firefox/12.0 PocketMine-MP"]);
curl_setopt($ch, CURLOPT_HTTPHEADER, array_merge(["User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:12.0) Gecko/20100101 Firefox/12.0 PocketMine-MP"], $extraHeaders));
curl_setopt($ch, CURLOPT_AUTOREFERER, true);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
@ -464,10 +470,11 @@ class Utils{
* @param $page
* @param array|string $args
* @param int $timeout
* @param array $extraHeaders
*
* @return bool|mixed
*/
public static function postURL($page, $args, $timeout = 10){
public static function postURL($page, $args, $timeout = 10, array $extraHeaders = []){
if(Utils::$online === false){
return false;
}
@ -481,7 +488,7 @@ class Utils{
curl_setopt($ch, CURLOPT_POSTFIELDS, $args);
curl_setopt($ch, CURLOPT_AUTOREFERER, true);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
curl_setopt($ch, CURLOPT_HTTPHEADER, ["User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:12.0) Gecko/20100101 Firefox/12.0 PocketMine-MP"]);
curl_setopt($ch, CURLOPT_HTTPHEADER, array_merge(["User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:12.0) Gecko/20100101 Firefox/12.0 PocketMine-MP"], $extraHeaders));
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, (int) $timeout);
$ret = curl_exec($ch);