feat(ip-geo): full-chain IP 归属地 on comments, user home, center, post
This commit is contained in:
kate522 committed
1 parent
1f2ca3ac8f
commit
ac7ff8d4f2
13 files changed
+457
-33
No files matched your search
@@ -17,6 +17,7 @@ require_once AKSRT_DIR . '/inc/helpers/aksrt-domain-model.php';
|
||||
require_once AKSRT_DIR . '/inc/helpers/aksrt-template-tags.php';
|
||||
require_once AKSRT_DIR . '/inc/helpers/aksrt-frontend-tags.php';
|
||||
// Comment kernel (shared by post / forum / shop surfaces).
|
||||
require_once AKSRT_DIR . '/inc/helpers/aksrt-ip-geo.php';
|
||||
require_once AKSRT_DIR . '/inc/helpers/comments/content.php';
|
||||
require_once AKSRT_DIR . '/inc/helpers/comments/actions.php';
|
||||
require_once AKSRT_DIR . '/inc/helpers/comments/geo.php';
|
||||
|
||||
@@ -0,0 +1,312 @@
|
||||
<?php
|
||||
/**
|
||||
* IP 归属地 — shared storage, format, and display helpers.
|
||||
*
|
||||
* Display positions (ip_geo_display): comment | user_home | user_center | post
|
||||
* Meta:
|
||||
* comment → aksrt_comment_addr (array)
|
||||
* user → aksrt_user_addr (array), aksrt_register_ip (string)
|
||||
*
|
||||
* @package AKSRT
|
||||
*/
|
||||
|
||||
defined('ABSPATH') || exit;
|
||||
|
||||
if (!function_exists('aksrt_get_ip_geo_config')) :
|
||||
/**
|
||||
* @return array<string,mixed>
|
||||
*/
|
||||
function aksrt_get_ip_geo_config(): array {
|
||||
if (class_exists('\AKSRT\Settings\Settings') && method_exists('\AKSRT\Settings\Settings', 'get_ip_geo_settings')) {
|
||||
return \AKSRT\Settings\Settings::get_ip_geo_settings();
|
||||
}
|
||||
return [
|
||||
'ip_geo_enabled' => false,
|
||||
'ip_geo_display' => ['comment'],
|
||||
'ip_geo_format' => 'province_city',
|
||||
'ip_geo_fallback_text' => '',
|
||||
];
|
||||
}
|
||||
endif;
|
||||
|
||||
if (!function_exists('aksrt_ip_geo_master_enabled')) :
|
||||
function aksrt_ip_geo_master_enabled(): bool {
|
||||
$c = aksrt_get_ip_geo_config();
|
||||
return !empty($c['ip_geo_enabled']);
|
||||
}
|
||||
endif;
|
||||
|
||||
if (!function_exists('aksrt_ip_geo_display_enabled')) :
|
||||
/**
|
||||
* Whether a surface may show IP 归属地 badges.
|
||||
*
|
||||
* @param string $location comment|user_home|user_center|post
|
||||
*/
|
||||
function aksrt_ip_geo_display_enabled(string $location): bool {
|
||||
if (!aksrt_ip_geo_master_enabled()) {
|
||||
return false;
|
||||
}
|
||||
$c = aksrt_get_ip_geo_config();
|
||||
$display = $c['ip_geo_display'] ?? [];
|
||||
if (!is_array($display)) {
|
||||
$display = [$display];
|
||||
}
|
||||
$display = array_map('sanitize_key', $display);
|
||||
return in_array(sanitize_key($location), $display, true);
|
||||
}
|
||||
endif;
|
||||
|
||||
if (!function_exists('aksrt_ip_geo_format_key')) :
|
||||
function aksrt_ip_geo_format_key(): string {
|
||||
$c = aksrt_get_ip_geo_config();
|
||||
$format = sanitize_key((string) ($c['ip_geo_format'] ?? 'province_city'));
|
||||
return in_array($format, ['province_city', 'province', 'country_province'], true)
|
||||
? $format
|
||||
: 'province_city';
|
||||
}
|
||||
endif;
|
||||
|
||||
if (!function_exists('aksrt_user_city_enabled')) :
|
||||
/**
|
||||
* Users feature switch (user home / user center), independent of comment city_s.
|
||||
*/
|
||||
function aksrt_user_city_enabled(): bool {
|
||||
if (!class_exists('\AKSRT\Settings\Settings')) {
|
||||
return false;
|
||||
}
|
||||
$all = \AKSRT\Settings\Settings::get_all();
|
||||
return !empty($all['user_city_s']);
|
||||
}
|
||||
endif;
|
||||
|
||||
if (!function_exists('aksrt_user_city_type')) :
|
||||
/**
|
||||
* User-facing precision (maps to shared format keys).
|
||||
*/
|
||||
function aksrt_user_city_type(): string {
|
||||
if (!class_exists('\AKSRT\Settings\Settings')) {
|
||||
return aksrt_ip_geo_format_key();
|
||||
}
|
||||
$all = \AKSRT\Settings\Settings::get_all();
|
||||
$type = sanitize_key((string) ($all['user_city_type'] ?? ''));
|
||||
// zibll: pro / city
|
||||
if ($type === 'pro' || $type === 'province') {
|
||||
return 'province';
|
||||
}
|
||||
if ($type === 'city' || $type === 'province_city') {
|
||||
return 'province_city';
|
||||
}
|
||||
if ($type === 'country_province') {
|
||||
return 'country_province';
|
||||
}
|
||||
return aksrt_ip_geo_format_key();
|
||||
}
|
||||
endif;
|
||||
|
||||
if (!function_exists('aksrt_normalize_geo_addr')) :
|
||||
/**
|
||||
* @param mixed $raw Meta value.
|
||||
* @return array{country:string,province:string,city:string}
|
||||
*/
|
||||
function aksrt_normalize_geo_addr($raw): array {
|
||||
if (!is_array($raw)) {
|
||||
return ['country' => '', 'province' => '', 'city' => ''];
|
||||
}
|
||||
// Accept zibll-shaped nation → country.
|
||||
$country = trim((string) ($raw['country'] ?? $raw['nation'] ?? ''));
|
||||
return [
|
||||
'country' => $country,
|
||||
'province' => trim((string) ($raw['province'] ?? '')),
|
||||
'city' => trim((string) ($raw['city'] ?? '')),
|
||||
];
|
||||
}
|
||||
endif;
|
||||
|
||||
if (!function_exists('aksrt_format_geo_label')) :
|
||||
/**
|
||||
* @param array<string,string> $addr Addr.
|
||||
* @param string $type Format key.
|
||||
*/
|
||||
function aksrt_format_geo_label(array $addr, string $type = 'province_city'): string {
|
||||
$addr = aksrt_normalize_geo_addr($addr);
|
||||
if (class_exists('\AKSRT\Extensions\IPGeo')) {
|
||||
$label = \AKSRT\Extensions\IPGeo::get_instance()->format($addr, $type);
|
||||
if (is_string($label) && $label !== '') {
|
||||
return $label;
|
||||
}
|
||||
}
|
||||
// Local fallback (mirrors IPGeo::format).
|
||||
switch ($type) {
|
||||
case 'province':
|
||||
return $addr['province'] !== '' ? $addr['province'] : $addr['city'];
|
||||
case 'country_province':
|
||||
return trim($addr['country'] . ' ' . $addr['province']);
|
||||
case 'province_city':
|
||||
default:
|
||||
$parts = array_filter([$addr['province'], $addr['city']]);
|
||||
if (empty($parts) && $addr['country'] !== '') {
|
||||
return $addr['country'];
|
||||
}
|
||||
return implode(' ', $parts);
|
||||
}
|
||||
}
|
||||
endif;
|
||||
|
||||
if (!function_exists('aksrt_get_geo_badge_html')) :
|
||||
/**
|
||||
* @param array<string,string>|mixed $addr Addr meta.
|
||||
* @param string $type Format.
|
||||
* @param string $class CSS classes.
|
||||
* @param string $title Title attr.
|
||||
*/
|
||||
function aksrt_get_geo_badge_html($addr, string $type = 'province_city', string $class = 'badg badg-sm', string $title = ''): string {
|
||||
$label = aksrt_format_geo_label(is_array($addr) ? $addr : [], $type);
|
||||
if ($label === '') {
|
||||
$fallback = (string) (aksrt_get_ip_geo_config()['ip_geo_fallback_text'] ?? '');
|
||||
if ($fallback === '') {
|
||||
return '';
|
||||
}
|
||||
$label = $fallback;
|
||||
}
|
||||
if ($title === '') {
|
||||
$title = __('IP 属地', 'aksrt');
|
||||
}
|
||||
$class = trim($class . ' aksrt-ip-geo-badge');
|
||||
return '<span class="' . esc_attr($class) . '" title="' . esc_attr($title) . '">' . esc_html($label) . '</span>';
|
||||
}
|
||||
endif;
|
||||
|
||||
if (!function_exists('aksrt_lookup_geo_for_ip')) :
|
||||
/**
|
||||
* @return array{country:string,province:string,city:string}
|
||||
*/
|
||||
function aksrt_lookup_geo_for_ip(string $ip): array {
|
||||
$ip = trim($ip);
|
||||
if ($ip === '' || !class_exists('\AKSRT\Extensions\IPGeo')) {
|
||||
return ['country' => '', 'province' => '', 'city' => ''];
|
||||
}
|
||||
$geo = \AKSRT\Extensions\IPGeo::get_instance()->lookup($ip);
|
||||
return aksrt_normalize_geo_addr(is_array($geo) ? $geo : []);
|
||||
}
|
||||
endif;
|
||||
|
||||
if (!function_exists('aksrt_store_user_addr')) :
|
||||
/**
|
||||
* Resolve current client IP and persist user meta.
|
||||
* Zibll: refresh on every login when user_city_s is on.
|
||||
* Also refresh when article (post) display needs author addr.
|
||||
*/
|
||||
function aksrt_store_user_addr(int $user_id, ?string $ip = null): void {
|
||||
if ($user_id <= 0 || !aksrt_ip_geo_master_enabled()) {
|
||||
return;
|
||||
}
|
||||
$need = aksrt_user_city_enabled()
|
||||
|| aksrt_ip_geo_display_enabled('post')
|
||||
|| aksrt_ip_geo_display_enabled('user_home')
|
||||
|| aksrt_ip_geo_display_enabled('user_center');
|
||||
if (!$need) {
|
||||
return;
|
||||
}
|
||||
|
||||
if ($ip === null || $ip === '') {
|
||||
$ip = function_exists('aksrt_get_client_ip') ? (string) aksrt_get_client_ip() : (string) ($_SERVER['REMOTE_ADDR'] ?? '');
|
||||
}
|
||||
$ip = trim($ip);
|
||||
if ($ip === '') {
|
||||
return;
|
||||
}
|
||||
|
||||
$addr = aksrt_lookup_geo_for_ip($ip);
|
||||
if ($addr['country'] === '' && $addr['province'] === '' && $addr['city'] === '') {
|
||||
return;
|
||||
}
|
||||
update_user_meta($user_id, 'aksrt_user_addr', $addr);
|
||||
}
|
||||
endif;
|
||||
|
||||
if (!function_exists('aksrt_get_user_addr')) :
|
||||
/**
|
||||
* @param int $user_id User ID.
|
||||
* @return array{country:string,province:string,city:string}
|
||||
*/
|
||||
function aksrt_get_user_addr(int $user_id): array {
|
||||
if ($user_id <= 0) {
|
||||
return ['country' => '', 'province' => '', 'city' => ''];
|
||||
}
|
||||
$raw = get_user_meta($user_id, 'aksrt_user_addr', true);
|
||||
// Legacy / accidental zibll key.
|
||||
if ((!is_array($raw) || empty($raw)) && metadata_exists('user', $user_id, 'user_addr')) {
|
||||
$raw = get_user_meta($user_id, 'user_addr', true);
|
||||
}
|
||||
return aksrt_normalize_geo_addr($raw);
|
||||
}
|
||||
endif;
|
||||
|
||||
if (!function_exists('aksrt_get_user_city_badge_html')) :
|
||||
/**
|
||||
* Badge for user home / user center (requires user_city_s + display location).
|
||||
*
|
||||
* @param int $user_id User.
|
||||
* @param string $location user_home|user_center
|
||||
* @param string $class CSS.
|
||||
*/
|
||||
function aksrt_get_user_city_badge_html(int $user_id, string $location = 'user_home', string $class = 'badg'): string {
|
||||
if ($user_id <= 0 || !aksrt_user_city_enabled()) {
|
||||
return '';
|
||||
}
|
||||
if (!aksrt_ip_geo_display_enabled($location)) {
|
||||
return '';
|
||||
}
|
||||
return aksrt_get_geo_badge_html(aksrt_get_user_addr($user_id), aksrt_user_city_type(), $class);
|
||||
}
|
||||
endif;
|
||||
|
||||
if (!function_exists('aksrt_get_post_author_city_badge_html')) :
|
||||
/**
|
||||
* Article detail author IP 属地 (uses author last-login addr).
|
||||
*/
|
||||
function aksrt_get_post_author_city_badge_html(int $author_id = 0, string $class = 'badg badg-sm'): string {
|
||||
if (!aksrt_ip_geo_display_enabled('post')) {
|
||||
return '';
|
||||
}
|
||||
if ($author_id <= 0) {
|
||||
$author_id = (int) get_the_author_meta('ID');
|
||||
}
|
||||
if ($author_id <= 0) {
|
||||
return '';
|
||||
}
|
||||
// Prefer user_city type when feature on; else global format.
|
||||
$type = aksrt_user_city_enabled() ? aksrt_user_city_type() : aksrt_ip_geo_format_key();
|
||||
return aksrt_get_geo_badge_html(aksrt_get_user_addr($author_id), $type, $class);
|
||||
}
|
||||
endif;
|
||||
|
||||
// ── Hooks: persist on login / register ──────────────────────────────────────
|
||||
|
||||
add_action('wp_login', static function ($user_login, $user = null): void {
|
||||
$user_id = 0;
|
||||
if ($user instanceof WP_User) {
|
||||
$user_id = (int) $user->ID;
|
||||
} elseif (is_string($user_login) && $user_login !== '') {
|
||||
$u = get_user_by('login', $user_login);
|
||||
$user_id = $u instanceof WP_User ? (int) $u->ID : 0;
|
||||
}
|
||||
if ($user_id > 0 && function_exists('aksrt_store_user_addr')) {
|
||||
aksrt_store_user_addr($user_id);
|
||||
}
|
||||
}, 20, 2);
|
||||
|
||||
add_action('user_register', static function ($user_id): void {
|
||||
$user_id = (int) $user_id;
|
||||
if ($user_id <= 0) {
|
||||
return;
|
||||
}
|
||||
$ip = function_exists('aksrt_get_client_ip') ? (string) aksrt_get_client_ip() : (string) ($_SERVER['REMOTE_ADDR'] ?? '');
|
||||
$ip = trim($ip);
|
||||
if ($ip !== '') {
|
||||
update_user_meta($user_id, 'aksrt_register_ip', $ip);
|
||||
}
|
||||
if (function_exists('aksrt_store_user_addr')) {
|
||||
aksrt_store_user_addr($user_id, $ip !== '' ? $ip : null);
|
||||
}
|
||||
}, 20, 1);
|
||||
@@ -2,7 +2,8 @@
|
||||
/**
|
||||
* Comment city / IP geo helpers.
|
||||
*
|
||||
* Meta key: aksrt_comment_addr (array|string from IPGeo).
|
||||
* Meta key: aksrt_comment_addr (array from IPGeo).
|
||||
* Gates: extensions.ip_geo_enabled + ip_geo_display includes comment + comment_city_s.
|
||||
*
|
||||
* @package AKSRT
|
||||
*/
|
||||
@@ -14,6 +15,21 @@ if (!function_exists('aksrt_comment_city_enabled')) :
|
||||
* Whether comment city badges are enabled.
|
||||
*/
|
||||
function aksrt_comment_city_enabled(): bool {
|
||||
// Prefer shared display gate when available.
|
||||
if (function_exists('aksrt_ip_geo_display_enabled')) {
|
||||
if (!aksrt_ip_geo_display_enabled('comment')) {
|
||||
// Allow legacy path: comment_city_s alone still works if master is on
|
||||
// but display list empty — require master + city_s at minimum.
|
||||
if (!function_exists('aksrt_ip_geo_master_enabled') || !aksrt_ip_geo_master_enabled()) {
|
||||
return false;
|
||||
}
|
||||
// Master on but location not selected → off.
|
||||
return false;
|
||||
}
|
||||
} elseif (function_exists('aksrt_ip_geo_master_enabled') && !aksrt_ip_geo_master_enabled()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!class_exists('\AKSRT\Settings\Settings')) {
|
||||
return false;
|
||||
}
|
||||
@@ -28,7 +44,7 @@ if (!function_exists('aksrt_comment_city_type')) :
|
||||
*/
|
||||
function aksrt_comment_city_type(): string {
|
||||
if (!class_exists('\AKSRT\Settings\Settings')) {
|
||||
return 'province_city';
|
||||
return function_exists('aksrt_ip_geo_format_key') ? aksrt_ip_geo_format_key() : 'province_city';
|
||||
}
|
||||
$s = \AKSRT\Settings\Settings::get_comment_display_settings();
|
||||
$type = sanitize_key((string) ($s['city_type'] ?? 'province_city'));
|
||||
@@ -54,19 +70,21 @@ if (!function_exists('aksrt_store_comment_addr')) :
|
||||
$ip = $comment instanceof WP_Comment ? (string) $comment->comment_author_IP : '';
|
||||
}
|
||||
$ip = trim((string) $ip);
|
||||
if ($ip === '' || !class_exists('\AKSRT\Extensions\IPGeo')) {
|
||||
if ($ip === '') {
|
||||
return;
|
||||
}
|
||||
$geo = \AKSRT\Extensions\IPGeo::get_instance()->lookup($ip);
|
||||
if (!is_array($geo)) {
|
||||
if (function_exists('aksrt_lookup_geo_for_ip')) {
|
||||
$addr = aksrt_lookup_geo_for_ip($ip);
|
||||
} elseif (class_exists('\AKSRT\Extensions\IPGeo')) {
|
||||
$geo = \AKSRT\Extensions\IPGeo::get_instance()->lookup($ip);
|
||||
$addr = [
|
||||
'country' => (string) ($geo['country'] ?? ''),
|
||||
'province' => (string) ($geo['province'] ?? ''),
|
||||
'city' => (string) ($geo['city'] ?? ''),
|
||||
];
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
// Store compact array.
|
||||
$addr = [
|
||||
'country' => (string) ($geo['country'] ?? ''),
|
||||
'province' => (string) ($geo['province'] ?? ''),
|
||||
'city' => (string) ($geo['city'] ?? ''),
|
||||
];
|
||||
if ($addr['country'] === '' && $addr['province'] === '' && $addr['city'] === '') {
|
||||
return;
|
||||
}
|
||||
@@ -85,6 +103,9 @@ if (!function_exists('aksrt_get_comment_addr')) :
|
||||
return [];
|
||||
}
|
||||
$raw = get_comment_meta($comment_id, 'aksrt_comment_addr', true);
|
||||
if (function_exists('aksrt_normalize_geo_addr')) {
|
||||
return aksrt_normalize_geo_addr($raw);
|
||||
}
|
||||
return is_array($raw) ? $raw : [];
|
||||
}
|
||||
endif;
|
||||
@@ -97,6 +118,9 @@ if (!function_exists('aksrt_format_comment_city_label')) :
|
||||
* @param string $type Format.
|
||||
*/
|
||||
function aksrt_format_comment_city_label(array $addr, string $type = 'province_city'): string {
|
||||
if (function_exists('aksrt_format_geo_label')) {
|
||||
return aksrt_format_geo_label($addr, $type);
|
||||
}
|
||||
$country = trim((string) ($addr['country'] ?? ''));
|
||||
$province = trim((string) ($addr['province'] ?? ''));
|
||||
$city = trim((string) ($addr['city'] ?? ''));
|
||||
@@ -125,7 +149,14 @@ if (!function_exists('aksrt_get_comment_city_badge_html')) :
|
||||
if (!aksrt_comment_city_enabled()) {
|
||||
return '';
|
||||
}
|
||||
$addr = aksrt_get_comment_addr($comment);
|
||||
if (function_exists('aksrt_get_geo_badge_html')) {
|
||||
return aksrt_get_geo_badge_html(
|
||||
aksrt_get_comment_addr($comment),
|
||||
aksrt_comment_city_type(),
|
||||
'badg badg-sm comment-city-badge'
|
||||
);
|
||||
}
|
||||
$addr = aksrt_get_comment_addr($comment);
|
||||
$label = aksrt_format_comment_city_label($addr, aksrt_comment_city_type());
|
||||
if ($label === '') {
|
||||
return '';
|
||||
|
||||
@@ -49,7 +49,7 @@ extract($context, EXTR_SKIP); // phpcs:ignore WordPress.PHP.DontExtract.extract_
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
<div class="uc-header__meta">
|
||||
<div class="uc-header__meta desc user-identity flex ac hh">
|
||||
<span class="uc-header__meta-item" title="<?php esc_attr_e('用户名', 'aksrt'); ?>">
|
||||
<i class="fas fa-user" aria-hidden="true"></i> <?php echo esc_html($target_user->user_login); ?>
|
||||
</span>
|
||||
@@ -58,6 +58,15 @@ extract($context, EXTR_SKIP); // phpcs:ignore WordPress.PHP.DontExtract.extract_
|
||||
<i class="fas fa-envelope" aria-hidden="true"></i> <?php echo esc_html($target_user->user_email); ?>
|
||||
</span>
|
||||
<?php endif; ?>
|
||||
<?php
|
||||
// IP 归属地 (zibll user_page_header_desc + user_city_s).
|
||||
$uc_city = function_exists('aksrt_get_user_city_badge_html')
|
||||
? aksrt_get_user_city_badge_html((int) $user_id, 'user_center', 'badg')
|
||||
: '';
|
||||
if ($uc_city !== '') {
|
||||
echo $uc_city; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uc-header__actions">
|
||||
|
||||
Reference in new issue
Block a user