Merged in feature/280-dev-dev01 (pull request #21)

auto-patch 280-dev-dev01-2024-01-19T16_41_58 * auto-patch 280-dev-dev01-2024-01-19T16_41_58
2024-01-19 16:44:43 +00:00
parent 2699b5437a
commit be83910651
2125 changed files with 179300 additions and 35639 deletions
--- a/wp/wp-content/ip-geo-api/drop-in-admin-sample.php
+++ b/wp/wp-content/ip-geo-api/drop-in-admin-sample.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Drop-in for IP Geo Block custom filters for admin
+ *
+ * This file should be named as `drop-in-admin.php`.
+ *
+ * @package   IP_Geo_Block
+ * @author    tokkonopapa <tokkonopapa@yahoo.com>
+ * @license   GPL-3.0
+ * @link      http://www.ipgeoblock.com/
+ * @see       http://www.ipgeoblock.com/codex/#filter-hooks
+ * @example   Use `IP_Geo_Block::add_filter()` instead of `add_filter()`
+ */
+class_exists( 'IP_Geo_Block', FALSE ) or die;
+
+/**
+ * Analyze entries in "Validation logs"
+ *
+ * @param array $logs An array including each entry where:
+ * Array (
+ *     [0 DB row number] => 154
+ *     [1 Target       ] => comment
+ *     [2 Time         ] => 1534580897
+ *     [3 IP address   ] => 102.177.147.***
+ *     [4 Country code ] => ZA
+ *     [5 Result       ] => blocked
+ *     [6 AS number    ] => AS328239
+ *     [7 Request      ] => POST[80]:/wp-comments-post.php
+ *     [8 User agent   ] => Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) ...
+ *     [9 HTTP headers ] => HTTP_ORIGIN=http://localhost,HTTP_X_FORWARDED_FOR=102.177.147.***
+ *    [10 $_POST data  ] => comment=Hello.,author,email,url,comment_post_ID,comment_parent
+ * )
+ *
+ * And put a mark at "Target"
+ *    ¹¹: Passed  in Whitelist
+ *    ¹²: Passed  in Blacklist
+ *    ¹³: Passed  not in Lists
+ *    ²¹: Blocked in Whitelist
+ *    ²²: Blocked in Blacklist
+ *    ²³: Blocked not in Lists
+ */
+function ip_geo_block_logs( $logs ) {
+	// Get settings of IP Geo Block
+	$settings = IP_Geo_Block::get_option();
+
+	// White/Black list for back-end
+	$white_backend = $settings['white_list'];
+	$black_backend = $settings['black_list'];
+
+	// White/Black list for front-end
+	if ( $settings['public']['matching_rule'] < 0 ) {
+		// Follow "Validation rule settings"
+		$white_frontend = $white_backend;
+		$black_frontend = $black_backend;
+	} else {
+		// Whitelist or Blacklist for "Public facing pages"
+		$white_frontend = $settings['public']['white_list'];
+		$black_frontend = $settings['public']['black_list'];
+	}
+
+	foreach ( $logs as $key => $log ) {
+		// Passed or Blocked
+		$mark = IP_Geo_Block::is_passed( $log[5] ) ? '&sup1;' : '&sup2;';
+
+		// Whitelisted, Blacklisted or N/A
+		if ( 'public' === $log[1] ) {
+			$mark .= IP_Geo_Block::is_listed( $log[4], $white_frontend ) ? '&sup1;' : (
+			         IP_Geo_Block::is_listed( $log[4], $black_frontend ) ? '&sup2;' : '&sup3;' );
+		} else {
+			$mark .= IP_Geo_Block::is_listed( $log[4], $white_backend  ) ? '&sup1;' : (
+			         IP_Geo_Block::is_listed( $log[4], $black_backend  ) ? '&sup2;' : '&sup3;' );
+		}
+
+		// Put a mark at "Target"
+		$logs[ $key ][1] .= $mark;
+	}
+
+	return $logs;
+}
+
+IP_Geo_Block::add_filter( 'ip-geo-block-logs', 'ip_geo_block_logs' );
+
+/**
+ * Register UI "Preset filters" at "Search in logs"
+ *
+ * @param  array $filters An empty array by default.
+ * @return array $filters The array of paired with 'title' and 'value'.
+ */
+function ip_geo_block_logs_preset( $filters ) {
+	return array(
+		array( 'title' => '<span class="ip-geo-block-icon ip-geo-block-icon-happy"    >&nbsp;</span>' . __( '<span title="Show only passed entries whose country codes are in Whitelist.">Passed in Whitelist</span>',        'ip-geo-block' ), 'value' => '&sup1;&sup1;' ),
+		array( 'title' => '<span class="ip-geo-block-icon ip-geo-block-icon-grin2"    >&nbsp;</span>' . __( '<span title="Show only passed entries whose country codes are in Blacklist.">Passed in Blacklist</span>',        'ip-geo-block' ), 'value' => '&sup1;&sup2;' ),
+		array( 'title' => '<span class="ip-geo-block-icon ip-geo-block-icon-cool"     >&nbsp;</span>' . __( '<span title="Show only passed entries whose country codes are not in either list.">Passed not in List</span>',   'ip-geo-block' ), 'value' => '&sup1;&sup3;' ),
+		array( 'title' => '<span class="ip-geo-block-icon ip-geo-block-icon-confused" >&nbsp;</span>' . __( '<span title="Show only blocked entries whose country codes are in Whitelist.">Blocked in Whitelist</span>',      'ip-geo-block' ), 'value' => '&sup2;&sup1;' ),
+		array( 'title' => '<span class="ip-geo-block-icon ip-geo-block-icon-confused2">&nbsp;</span>' . __( '<span title="Show only blocked entries whose country codes are in Blacklist.">Blocked in Blacklist</span>',      'ip-geo-block' ), 'value' => '&sup2;&sup2;' ),
+		array( 'title' => '<span class="ip-geo-block-icon ip-geo-block-icon-crying"   >&nbsp;</span>' . __( '<span title="Show only blocked entries whose country codes are not in either list.">Blocked not in List</span>', 'ip-geo-block' ), 'value' => '&sup2;&sup3;' ),
+	);
+}
+
+IP_Geo_Block::add_filter( 'ip-geo-block-logs-preset', 'ip_geo_block_logs_preset' );