--- lbbs/src/user_info_display.c 2025/10/23 11:29:43 1.4 +++ lbbs/src/user_info_display.c 2025/11/04 13:49:51 1.19 @@ -1,19 +1,12 @@ -/*************************************************************************** - user_list_display.c - description - ------------------- - Copyright : (C) 2004-2025 by Leaflet - Email : leaflet@leafok.com - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/* SPDX-License-Identifier: GPL-3.0-or-later */ +/* + * user_list_display + * - display user information + * + * Copyright (C) 2004-2025 by Leaflet + */ +#include "bbs.h" #include "ip_mask.h" #include "lml.h" #include "log.h" @@ -22,6 +15,7 @@ #include "user_list.h" #include "user_info_display.h" #include "user_priv.h" +#include #include #include #include @@ -39,14 +33,20 @@ int user_info_display(USER_INFO *p_user_ USER_ONLINE_INFO sessions[BBS_max_sessions_per_user]; int session_cnt = BBS_max_sessions_per_user; int article_cnt; + const char *astro_name; + char astro_str[LINE_BUFFER_LEN]; struct tm tm_last_login; char str_last_login_dt[LAST_LOGIN_DT_MAX_LEN + 1]; struct tm tm_last_logout; char str_last_logout_dt[LAST_LOGIN_DT_MAX_LEN + 1]; char login_ip[IP_ADDR_LEN]; int ip_mask_level; + const char *p_action_title; char action_str[LINE_BUFFER_LEN]; - char intro_f[BBS_user_intro_max_len]; + int life; + int user_level; + const char *user_level_name; + char intro_f[BBS_user_intro_max_len + 1]; int intro_len; char user_info_f[BUFSIZ]; long line_offsets[BBS_user_intro_max_line + 1]; @@ -56,10 +56,36 @@ int user_info_display(USER_INFO *p_user_ int ret; int i; + if (p_user_info == NULL) + { + log_error("NULL pointer error\n"); + return -1; + } + article_cnt = get_user_article_cnt(p_user_info->uid); + astro_name = get_astro_name(p_user_info->birthday); + if (p_user_info->gender_pub && toupper(p_user_info->gender) == 'M') + { + snprintf(astro_str, sizeof(astro_str), + "\033[1;36m%s座\033[m", + astro_name); + } + else if (p_user_info->gender_pub && toupper(p_user_info->gender) == 'F') + { + snprintf(astro_str, sizeof(astro_str), + "\033[1;35m%s座\033[m", + astro_name); + } + else + { + snprintf(astro_str, sizeof(astro_str), + "\033[1;33m%s座\033[m", + astro_name); + } + localtime_r(&(p_user_info->last_login_dt), &tm_last_login); - strftime(str_last_login_dt, sizeof(str_last_login_dt), "%c", &tm_last_login); + strftime(str_last_login_dt, sizeof(str_last_login_dt), "%F %H:%M", &tm_last_login); if (p_user_info->last_logout_dt <= p_user_info->last_login_dt) { strncpy(str_last_logout_dt, str_last_login_dt, sizeof(str_last_logout_dt) - 1); @@ -68,7 +94,7 @@ int user_info_display(USER_INFO *p_user_ else { localtime_r(&(p_user_info->last_logout_dt), &tm_last_logout); - strftime(str_last_logout_dt, sizeof(str_last_logout_dt), "%c", &tm_last_logout); + strftime(str_last_logout_dt, sizeof(str_last_logout_dt), "%F %H:%M", &tm_last_logout); } action_str[0] = '\0'; @@ -84,13 +110,17 @@ int user_info_display(USER_INFO *p_user_ p = action_str; for (i = 0; i < session_cnt; i++) { - if (p + strlen(sessions[i].current_action_title) + 4 >= action_str + sizeof(action_str)) // buffer overflow + p_action_title = (sessions[i].current_action_title != NULL + ? sessions[i].current_action_title + : sessions[i].current_action); + + if (p + strlen(p_action_title) + 4 >= action_str + sizeof(action_str)) // buffer overflow { log_error("action_str of user(uid=%d) truncated at i=%d\n", p_user_info->uid, i); break; } *p++ = '['; - for (q = sessions[i].current_action_title; *q != '\0';) + for (q = p_action_title; *q != '\0';) { *p++ = *q++; } @@ -113,22 +143,34 @@ int user_info_display(USER_INFO *p_user_ login_ip[0] = '\0'; } - intro_len = lml_render(p_user_info->intro, intro_f, sizeof(intro_f), 0); + if (p_user_info->life == 333 || p_user_info->life == 365 || p_user_info->life == 666 || p_user_info->life == 999) // Immortal + { + life = p_user_info->life; + } + else + { + life = p_user_info->life - (int)((time(NULL) - p_user_info->last_login_dt) / 86400 + 1); + } + + user_level = get_user_level(p_user_info->exp); + user_level_name = get_user_level_name(user_level); + + intro_len = lml_render(p_user_info->intro, intro_f, sizeof(intro_f), SCREEN_COLS, 0); snprintf(user_info_f, sizeof(user_info_f), "\n%s (%s) 上站 [%d] 发文 [%d]\n" "上次在 [%s] 从 [%s] 访问本站 经验值 [%d]\n" - "离线于 [%s] 等级 [%s]\n" + "离线于 [%s] 生命 [%d] 等级 [%s(%d)] 星座 [%s]\n" "%s\033[1m%s\033[m" "%s\n%s\n", p_user_info->username, p_user_info->nickname, p_user_info->visit_count, article_cnt, str_last_login_dt, (session_cnt > 0 ? login_ip : "未知"), p_user_info->exp, - (session_cnt > 0 ? "在线或因断线不详" : str_last_logout_dt), "?", + (session_cnt > 0 ? "在线或因断线不详" : str_last_logout_dt), life, user_level_name, user_level + 1, astro_str, (session_cnt > 0 ? "目前在线，状态如下：\n" : ""), (session_cnt > 0 ? action_str : ""), (intro_len > 0 ? "\033[0;36m个人说明档如下：\033[m" : "\033[0;36m没有个人说明档\033[m"), intro_f); - lines = split_data_lines(user_info_f, SCREEN_COLS, line_offsets, MIN(SCREEN_ROWS - 1, BBS_user_intro_max_line + 8), 1, NULL); + lines = split_data_lines(user_info_f, SCREEN_COLS + 1, line_offsets, MIN(SCREEN_ROWS - 1, BBS_user_intro_max_line + 8), 1, NULL); clearscr(); display_data(user_info_f, lines, line_offsets, 1, display_user_info_key_handler, DATA_READ_HELP);