--- lbbs/src/user_info_display.c 2025/10/23 14:57:02 1.12 +++ lbbs/src/user_info_display.c 2026/01/03 10:27:14 1.27 @@ -1,18 +1,14 @@ -/*************************************************************************** - 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-2026 Leaflet + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include "bbs.h" #include "ip_mask.h" @@ -28,8 +24,13 @@ #include #include -#define BBS_max_sessions_per_user 10 -#define LAST_LOGIN_DT_MAX_LEN 50 +enum _user_info_display_constant_t +{ + BBS_max_sessions_per_user = 10, + LAST_LOGIN_DT_MAX_LEN = 50, + ASTRO_STR_MAX_LEN = 64, + USER_INFO_MAX_LEN = 8192, +}; static int display_user_info_key_handler(int *p_key, DISPLAY_CTX *p_ctx) { @@ -42,7 +43,7 @@ int user_info_display(USER_INFO *p_user_ int session_cnt = BBS_max_sessions_per_user; int article_cnt; const char *astro_name; - char astro_str[LINE_BUFFER_LEN]; + char astro_str[ASTRO_STR_MAX_LEN]; struct tm tm_last_login; char str_last_login_dt[LAST_LOGIN_DT_MAX_LEN + 1]; struct tm tm_last_logout; @@ -51,10 +52,12 @@ int user_info_display(USER_INFO *p_user_ int ip_mask_level; const char *p_action_title; char action_str[LINE_BUFFER_LEN]; + int life; + int user_level; const char *user_level_name; - char intro_f[BBS_user_intro_max_len]; + char intro_f[BBS_user_intro_max_len + 1]; int intro_len; - char user_info_f[BUFSIZ]; + char user_info_f[USER_INFO_MAX_LEN]; long line_offsets[BBS_user_intro_max_line + 1]; long lines; char *p; @@ -62,6 +65,12 @@ int user_info_display(USER_INFO *p_user_ int ret; int i; + if (p_user_info == NULL) + { + log_error("NULL pointer error"); + return -1; + } + article_cnt = get_user_article_cnt(p_user_info->uid); astro_name = get_astro_name(p_user_info->birthday); @@ -102,7 +111,7 @@ int user_info_display(USER_INFO *p_user_ ret = query_user_online_info_by_uid(p_user_info->uid, sessions, &session_cnt, 0); if (ret < 0) { - log_error("query_user_online_info_by_uid(uid=%d, cnt=%d) error: %d\n", + log_error("query_user_online_info_by_uid(uid=%d, cnt=%d) error: %d", p_user_info->uid, session_cnt, ret); session_cnt = 0; } @@ -116,7 +125,7 @@ int user_info_display(USER_INFO *p_user_ 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); + log_error("action_str of user(uid=%d) truncated at i=%d", p_user_info->uid, i); break; } *p++ = '['; @@ -143,24 +152,34 @@ int user_info_display(USER_INFO *p_user_ login_ip[0] = '\0'; } - user_level_name = get_user_level_name(p_user_info->exp); + 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), 0); + 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] 星座 [%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), user_level_name, astro_str, - (session_cnt > 0 ? "目前在线，状态如下：\n" : ""), (session_cnt > 0 ? action_str : ""), - (intro_len > 0 ? "\033[0;36m个人说明档如下：\033[m" : "\033[0;36m没有个人说明档\033[m"), + (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 + 9), 1, NULL); clearscr(); display_data(user_info_f, lines, line_offsets, 1, display_user_info_key_handler, DATA_READ_HELP);