Upd. Firewall. Enhance IP data retrieval by adding subdivision and city information to the country report.

Author: svfcode

inc/spbc-tools.php

@@ -10,12 +10,16 @@ function spbc_report_country_part($ips_c, $ip = null)
     if (isset($ips_c[ $ip ]['country_code'])) {
         $country_code = strtolower($ips_c[ $ip ]['country_code']);
         $country_name = (isset($ips_c[ $ip ]['country_name']) ? $ips_c[ $ip ]['country_name'] : '-');
+        $subdivision = (isset($ips_c[ $ip ]['subdivision']) ? ', ' . $ips_c[ $ip ]['subdivision'] : '');
+        $city = (isset($ips_c[ $ip ]['city']) ? ', ' . $ips_c[ $ip ]['city'] : '');
 
         $country_part = sprintf(
-            '<img src="https://cleantalk.org/images/flags/%s.png" alt="%s" />&nbsp;%s',
+            '<img src="https://cleantalk.org/images/flags/%s.png" alt="%s" />&nbsp;%s%s%s',
             $country_code,
             $country_code,
-            $country_name
+            $country_name,
+            $subdivision,
+            $city
         );
     } else {
         $country_part = '-';

security-malware-firewall.php

@@ -631,6 +631,12 @@ function spbc_get_countries_by_ips($ips_data = '')
             if ( isset($v2['country_name']) ) {
                 $ips_c[ $ip_dec ]['country_name'] = $v2['country_name'];
             }
+            if ( isset($v2['subdivision']) && is_string($v2['subdivision']) && $v2['subdivision'] !== '' ) {
+                $ips_c[ $ip_dec ]['subdivision'] = $v2['subdivision'];
+            }
+            if ( isset($v2['city']) && is_string($v2['city']) && $v2['city'] !== '' ) {
+                $ips_c[ $ip_dec ]['city'] = $v2['city'];
+            }
         }
     }