kristuff / abuseipdb

lib/CurlTrait.php

Spacing +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
      */
     protected function setCurlOption($ch, int $option, $value): void
     {
-        if(!curl_setopt($ch,$option,$value)){
-            throw new \RuntimeException('curl_setopt failed! '.curl_error($ch));
+        if (!curl_setopt($ch, $option, $value)) {
+            throw new \RuntimeException('curl_setopt failed! ' . curl_error($ch));
         }
     }
 }

lib/ApiHandler.php

Indentation +3 added lines, -3 removed lines

@@ -92,7 +92,7 @@ 
      */
     public function report(string $ip, string $categories, string $message): ApiResponse
     {
-         // ip must be set
+            // ip must be set
         if (empty($ip)){
             throw new \InvalidArgumentException('Ip was empty');
         }
@@ -231,7 +231,7 @@ 
 
         // option
         if ($verbose){
-           $data['verbose'] = true;
+            $data['verbose'] = true;
         }
 
         return $this->apiRequest('check', $data, 'GET') ;
@@ -403,7 +403,7 @@ 
      * @access public
      * @param string      $message           The original message 
      *  
-	 * @return string
+     * @return string
      */
     public function cleanMessage(string $message): string
     {

Spacing +26 added lines, -26 removed lines

@@ -43,7 +43,7 @@ 
      * @access protected
      * @var array  
      */
-    protected $selfIps = []; 
+    protected $selfIps = [ ]; 
 
     /**
      * The maximum number of milliseconds to allow cURL functions to execute. If libcurl is 
@@ -65,7 +65,7 @@ 
      *                            to execute. Default is 0, no timeout
      * 
      */
-    public function __construct(string $apiKey, array $myIps = [], int $timeout = 0)
+    public function __construct(string $apiKey, array $myIps = [ ], int $timeout = 0)
     {
         $this->aipdbApiKey = $apiKey;
         $this->selfIps = $myIps;
@@ -111,17 +111,17 @@ 
     public function report(string $ip, string $categories, string $message): ApiResponse
     {
          // ip must be set
-        if (empty($ip)){
+        if (empty($ip)) {
             throw new \InvalidArgumentException('Ip was empty');
         }
 
         // categories must be set
-        if (empty($categories)){
+        if (empty($categories)) {
             throw new \InvalidArgumentException('Categories list was empty');
         }
 
         // message must be set
-        if (empty($message)){
+        if (empty($message)) {
             throw new \InvalidArgumentException('Report message was empty');
         }
 
@@ -178,16 +178,16 @@ 
     public function bulkReport(string $filePath): ApiResponse
     {
         // check file exists
-        if (!file_exists($filePath) || !is_file($filePath)){
+        if (!file_exists($filePath) || !is_file($filePath)) {
             throw new \InvalidArgumentException('The file [' . $filePath . '] does not exist.');
         }
 
         // check file is readable
-        if (!is_readable($filePath)){
+        if (!is_readable($filePath)) {
             throw new InvalidPermissionException('The file [' . $filePath . '] is not readable.');
         }
 
-        return $this->apiRequest('bulk-report', [], 'POST', $filePath);
+        return $this->apiRequest('bulk-report', [ ], 'POST', $filePath);
     }
 
     /**
@@ -211,11 +211,11 @@ 
     public function clearAddress(string $ip): ApiResponse
     {
         // ip must be set
-        if (empty($ip)){
+        if (empty($ip)) {
             throw new \InvalidArgumentException('IP argument must be set.');
         }
 
-        return $this->apiRequest('clear-address',  ['ipAddress' => $ip ], "DELETE") ;
+        return $this->apiRequest('clear-address', [ 'ipAddress' => $ip ], "DELETE");
     }
 
     /**
@@ -233,12 +233,12 @@ 
     public function check(string $ip, int $maxAgeInDays = 30, bool $verbose = false): ApiResponse
     {
         // max age must be less or equal to 365
-        if ( $maxAgeInDays > 365 || $maxAgeInDays < 1 ){
+        if ($maxAgeInDays > 365 || $maxAgeInDays < 1) {
             throw new \InvalidArgumentException('maxAgeInDays must be between 1 and 365.');
         }
 
         // ip must be set
-        if (empty($ip)){
+        if (empty($ip)) {
             throw new \InvalidArgumentException('ip argument must be set (empty value given)');
         }
 
@@ -249,11 +249,11 @@ 
         ];
 
         // option
-        if ($verbose){
-           $data['verbose'] = true;
+        if ($verbose) {
+           $data[ 'verbose' ] = true;
         }
 
-        return $this->apiRequest('check', $data, 'GET') ;
+        return $this->apiRequest('check', $data, 'GET');
     }
 
     /**
@@ -302,12 +302,12 @@ 
     public function checkBlock(string $network, int $maxAgeInDays = 30): ApiResponse
     {
         // max age must be between 1 and 365
-        if ($maxAgeInDays > 365 || $maxAgeInDays < 1){
+        if ($maxAgeInDays > 365 || $maxAgeInDays < 1) {
             throw new \InvalidArgumentException('maxAgeInDays must be between 1 and 365 (' . $maxAgeInDays . ' was given)');
         }
 
         // ip must be set
-        if (empty($network)){
+        if (empty($network)) {
             throw new \InvalidArgumentException('network argument must be set (empty value given)');
         }
 
@@ -336,7 +336,7 @@ 
      */
     public function blacklist(int $limit = 10000, bool $plainText = false, int $confidenceMinimum = 100): ApiResponse
     {
-        if ($limit < 1){
+        if ($limit < 1) {
             throw new \InvalidArgumentException('limit must be at least 1 (' . $limit . ' was given)');
         }
 
@@ -348,8 +348,8 @@ 
 
         // plaintext paremeter has no value and must be added only when true 
         // (set plaintext=false won't work)
-        if ($plainText){
-            $data['plaintext'] = $plainText;
+        if ($plainText) {
+            $data[ 'plaintext' ] = $plainText;
         }
 
         return $this->apiRequest('blacklist', $data, 'GET');
@@ -370,9 +370,9 @@ 
      */
     protected function apiRequest(string $path, array $data, string $method = 'GET', string $csvFilePath = ''): ApiResponse
     {
-        $curlErrorNumber = -1;                   // will be used later to check curl execution
+        $curlErrorNumber = -1; // will be used later to check curl execution
         $curlErrorMessage = '';
-        $url = $this->aipdbApiEndpoint . $path;  // api url
+        $url = $this->aipdbApiEndpoint . $path; // api url
         
         // set the wanted format, JSON (required to prevent having full html page on error)
         // and the AbuseIPDB API Key as a header
@@ -385,8 +385,8 @@ 
         $ch = curl_init(); 
   
         // for csv
-        if (!empty($csvFilePath)){
-            $cfile = new \CurlFile($csvFilePath,  'text/csv', 'csv');
+        if (!empty($csvFilePath)) {
+            $cfile = new \CurlFile($csvFilePath, 'text/csv', 'csv');
             //curl file itself return the realpath with prefix of @
             $data = array('csv' => $cfile);
         }
@@ -426,7 +426,7 @@ 
         // close connection
         curl_close($ch);
 
-        if ($curlErrorNumber !== 0){
+        if ($curlErrorNumber !== 0) {
             throw new \RuntimeException($curlErrorMessage);
         }
 
@@ -449,7 +449,7 @@ 
         $message = str_replace('\\', '', $message);
 
         // Remove self ips
-        foreach ($this->selfIps as $ip){
+        foreach ($this->selfIps as $ip) {
             $message = str_replace($ip, '*', $message);
         }
 

lib/QuietApiHandler.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
     public function report(string $ip, string $categories, string $message): ApiResponse
     {
         try {
-            return parent::report($ip,$categories,$message);
+            return parent::report($ip, $categories, $message);
         } catch (\Exception $e) {
             return ApiResponse::createErrorResponse($e->getMessage());
         }

lib/ApiBase.php

Indentation +7 added lines, -7 removed lines

@@ -79,8 +79,8 @@ 
         // Open proxy, open relay, or Tor exit node.
         ['openproxy'       , '9', 'Open Proxy', true],        
 
-         // Comment/forum spam, HTTP referer spam, or other CMS spam.
-         ['webspam'         , '10', 'Web Spam', true],        
+            // Comment/forum spam, HTTP referer spam, or other CMS spam.
+            ['webspam'         , '10', 'Web Spam', true],        
 
         // Spam email content, infected attachments, and phishing emails. Note: Limit comments to only relevent
         // information (instead of log dumps) and be sure to remove PII if you want to remain anonymous.
@@ -159,7 +159,7 @@ 
             if ($cat[0] === $categoryName) {
                 return $cat[1];
             }
-         }
+            }
 
         // not found
         return false;
@@ -177,9 +177,9 @@ 
     public static function getCategoryNameById(string $categoryId)
     {
         foreach (self::$aipdbApiCategories as $cat){
-           if ($cat[1] === $categoryId) {
-               return $cat[0];
-           }
+            if ($cat[1] === $categoryId) {
+                return $cat[0];
+            }
         }
 
         // not found
@@ -204,7 +204,7 @@ 
                 return $i;
             }
             $i++;
-         }
+            }
 
         // not found
         return false;

Spacing +38 added lines, -38 removed lines

@@ -53,82 +53,82 @@ 
     protected static $aipdbApiCategories = [
         
         // Altering DNS records resulting in improper redirection.        
-        ['dns-c'           , '1', 'DNS Compromise', true],    
+        [ 'dns-c', '1', 'DNS Compromise', true ],    
         
         // Falsifying domain server cache (cache poisoning).
-        ['dns-p'           , '2', 'DNS Poisoning', true],     
+        [ 'dns-p', '2', 'DNS Poisoning', true ],     
         
         // Fraudulent orders.
-        ['fraud-orders'    , '3', 'Fraud Orders', true],      
+        [ 'fraud-orders', '3', 'Fraud Orders', true ],      
 
         // Participating in distributed denial-of-service (usually part of botnet).        
-        ['ddos'            , '4', 'DDoS Attack', true],       
+        [ 'ddos', '4', 'DDoS Attack', true ],       
         
         // 
-        ['ftp-bf'          , '5', 'FTP Brute-Force', true],   
+        [ 'ftp-bf', '5', 'FTP Brute-Force', true ],   
         
         // Oversized IP packet.
-        ['pingdeath'       , '6', 'Ping of Death', true],     
+        [ 'pingdeath', '6', 'Ping of Death', true ],     
 
         // Phishing websites and/or email.
-        ['phishing'        , '7', 'Phishing', true],          
+        [ 'phishing', '7', 'Phishing', true ],          
         
         //
-        ['fraudvoip'       , '8', 'Fraud VoIP', true],        
+        [ 'fraudvoip', '8', 'Fraud VoIP', true ],        
 
         // Open proxy, open relay, or Tor exit node.
-        ['openproxy'       , '9', 'Open Proxy', true],        
+        [ 'openproxy', '9', 'Open Proxy', true ],        
 
          // Comment/forum spam, HTTP referer spam, or other CMS spam.
-         ['webspam'         , '10', 'Web Spam', true],        
+         [ 'webspam', '10', 'Web Spam', true ],        
 
         // Spam email content, infected attachments, and phishing emails. Note: Limit comments to only relevent
         // information (instead of log dumps) and be sure to remove PII if you want to remain anonymous.
-        ['emailspam'       , '11', 'Email Spam', true],                                                   
+        [ 'emailspam', '11', 'Email Spam', true ],                                                   
              
         // CMS blog comment spam.
-        ['blogspam'        , '12', 'Blog Spam', true],      
+        [ 'blogspam', '12', 'Blog Spam', true ],      
         
         // Conjunctive category.
-        ['vpnip'           , '13', 'VPN IP', false], // to check alone ??           
+        [ 'vpnip', '13', 'VPN IP', false ], // to check alone ??           
 
         // Scanning for open ports and vulnerable services.
-        ['scan'            , '14', 'Port Scan', true],        
+        [ 'scan', '14', 'Port Scan', true ],        
        
         // 
-        ['hack'            , '15', 'Hacking', true],           
+        [ 'hack', '15', 'Hacking', true ],           
 
         // Attempts at SQL injection.
-        ['sql'             , '16', 'SQL Injection', true],     
+        [ 'sql', '16', 'SQL Injection', true ],     
         
         // Email sender spoofing.
-        ['spoof'           , '17', 'Spoofing', true],         
+        [ 'spoof', '17', 'Spoofing', true ],         
 
         // Credential brute-force attacks on webpage logins and services like SSH, FTP, SIP, SMTP, RDP, etc. 
         // This category is seperate from DDoS attacks.
-        ['brute'           , '18', 'Brute-Force', true],     
+        [ 'brute', '18', 'Brute-Force', true ],     
 
         // Webpage scraping (for email addresses, content, etc) and crawlers that do not honor robots.txt.                                  
         // Excessive requests and user agent spoofing can also be reported here.                        
-        ['badbot'          , '19', 'Bad Web Bot', true],      
+        [ 'badbot', '19', 'Bad Web Bot', true ],      
                                                          
         // Host is likely infected with malware and being used for other attacks or to host malicious content. 
         // The host owner may not be aware of the compromise. This category is often used in combination 
         // with other attack categories.
-        ['explhost'        , '20', 'Exploited Host', true],
+        [ 'explhost', '20', 'Exploited Host', true ],
         
         // Attempts to probe for or exploit installed web applications such as a CMS 
         // like WordPress/Drupal, e-commerce solutions, forum software, phpMyAdmin and 
         // various other software plugins/solutions.                                                         
-        ['webattack'       , '21', 'Web App Attack', true ],   
+        [ 'webattack', '21', 'Web App Attack', true ],   
         
         // Secure Shell (SSH) abuse. Use this category in combination 
         // with more specific categories.
-        ['ssh'             , '22', 'SSH', false],              
+        [ 'ssh', '22', 'SSH', false ],              
 
         // Abuse was targeted at an "Internet of Things" type device. Include 
         // information about what type of device was targeted in the comments.         
-        ['iot'             , '23', 'IoT Targeted', true],     
+        [ 'iot', '23', 'IoT Targeted', true ],     
     ];
 
     /**
@@ -155,9 +155,9 @@ 
      */
     public static function getCategoryIdByName(string $categoryName)
     {
-        foreach (self::$aipdbApiCategories as $cat){
-            if ($cat[0] === $categoryName) {
-                return $cat[1];
+        foreach (self::$aipdbApiCategories as $cat) {
+            if ($cat[ 0 ] === $categoryName) {
+                return $cat[ 1 ];
             }
          }
 
@@ -176,9 +176,9 @@ 
      */
     public static function getCategoryNameById(string $categoryId)
     {
-        foreach (self::$aipdbApiCategories as $cat){
-           if ($cat[1] === $categoryId) {
-               return $cat[0];
+        foreach (self::$aipdbApiCategories as $cat) {
+           if ($cat[ 1 ] === $categoryId) {
+               return $cat[ 0 ];
            }
         }
 
@@ -199,8 +199,8 @@ 
     protected static function getCategoryIndex(string $value, int $index)
     {
         $i = 0;
-        foreach (self::$aipdbApiCategories as $cat){
-            if ($cat[$index] === $value) {
+        foreach (self::$aipdbApiCategories as $cat) {
+            if ($cat[ $index ] === $value) {
                 return $i;
             }
             $i++;
@@ -234,21 +234,21 @@ 
         foreach ($cats as $cat) {
 
             // get index on our array of categories
-            $catIndex    = is_numeric($cat) ? self::getCategoryIndex($cat, 1) : self::getCategoryIndex($cat, 0);
+            $catIndex = is_numeric($cat) ? self::getCategoryIndex($cat, 1) : self::getCategoryIndex($cat, 0);
 
             // check if found
-            if ($catIndex === false ){
+            if ($catIndex === false) {
                 throw new \InvalidArgumentException('Invalid report category was given.');
             }
 
             // get Id
-            $catId = self::$aipdbApiCategories[$catIndex][1];
+            $catId = self::$aipdbApiCategories[ $catIndex ][ 1 ];
 
             // need another ?
-            if ($needAnother !== false){
+            if ($needAnother !== false) {
 
                 // is a standalone cat ?
-                if (self::$aipdbApiCategories[$catIndex][3] === false) {
+                if (self::$aipdbApiCategories[ $catIndex ][ 3 ] === false) {
                     $needAnother = true;
 
                 } else {
@@ -259,10 +259,10 @@ 
             }
 
             // set or add to cats list 
-            $catsString = ($catsString === '') ? $catId : $catsString .','.$catId;
+            $catsString = ($catsString === '') ? $catId : $catsString . ',' . $catId;
         }
 
-        if ($needAnother !== false){
+        if ($needAnother !== false) {
             throw new \InvalidArgumentException('Invalid report category parameter given: this category can\'t be used alone.');
         }
 

lib/ApiResponse.php

Spacing +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
      */
     public function errors(): array
     {
-        return ($this->decodedResponse && property_exists($this->decodedResponse, 'errors')) ? $this->decodedResponse->errors : [];
+        return ($this->decodedResponse && property_exists($this->decodedResponse, 'errors')) ? $this->decodedResponse->errors : [ ];
     }
 
     /**