From 2960a6b06f22726b17ac141cb5f4b5c4ed41c95a Mon Sep 17 00:00:00 2001 From: W1zzard Date: Wed, 1 Nov 2017 11:23:13 +0100 Subject: [PATCH] Whitespace & Formatting --- upload/library/TPUDetectSpamReg/AS.php | 22 ++++++++++--------- upload/library/TPUDetectSpamReg/IPCountry.php | 4 +++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/upload/library/TPUDetectSpamReg/AS.php b/upload/library/TPUDetectSpamReg/AS.php index 708f04e..f9700e3 100644 --- a/upload/library/TPUDetectSpamReg/AS.php +++ b/upload/library/TPUDetectSpamReg/AS.php @@ -29,7 +29,9 @@ static function isIPv6($ip) static function getASNameAndNumber_cymru($ip, &$asNumber, &$asName) { - if (empty($ip)) return false; + if (empty($ip)) + return false; + $dns = null; try { @@ -82,16 +84,16 @@ static function getASNameAndNumber_moocherio($ip, &$asNumber, &$asName) $curl = curl_init(); curl_setopt_array($curl, array( - CURLOPT_URL => 'http://api.moocher.io/as/ip/'.$ip, - CURLOPT_RETURNTRANSFER => true, - CURLOPT_ENCODING => '', - CURLOPT_MAXREDIRS => 1, - CURLOPT_TIMEOUT => 1, - CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, - CURLOPT_CUSTOMREQUEST => 'GET', - CURLOPT_HTTPHEADER => array( + CURLOPT_URL => 'http://api.moocher.io/as/ip/'.$ip, + CURLOPT_RETURNTRANSFER => true, + CURLOPT_ENCODING => '', + CURLOPT_MAXREDIRS => 1, + CURLOPT_TIMEOUT => 1, + CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, + CURLOPT_CUSTOMREQUEST => 'GET', + CURLOPT_HTTPHEADER => array( 'content-type: application/json' - ), + ), )); $response = curl_exec($curl); diff --git a/upload/library/TPUDetectSpamReg/IPCountry.php b/upload/library/TPUDetectSpamReg/IPCountry.php index ab7060b..cdfe8b1 100644 --- a/upload/library/TPUDetectSpamReg/IPCountry.php +++ b/upload/library/TPUDetectSpamReg/IPCountry.php @@ -4,7 +4,9 @@ class TPUDetectSpamReg_IPCountry { static function getIPCountry($ip) { - if (empty($ip)) return 'XX'; + if (empty($ip)) + return 'XX'; + if (function_exists('geoip_db_avail') && geoip_db_avail(GEOIP_COUNTRY_EDITION)) { try