--- lbbs/src/menu_proc.c 2025/10/13 05:39:45 1.33 +++ lbbs/src/menu_proc.c 2025/10/14 06:27:44 1.37 @@ -15,6 +15,7 @@ ***************************************************************************/ #include "article_cache.h" +#include "article_favor_display.h" #include "article_view_log.h" #include "bbs.h" #include "bbs_cmd.h" @@ -211,7 +212,7 @@ int list_ex_section(void *param) { SECTION_LIST *p_section; - p_section = section_list_find_by_name(param, NULL); + p_section = section_list_find_by_name(param); if (p_section == NULL) { log_error("Section %s not found\n", (const char *)param); @@ -226,21 +227,86 @@ int list_ex_section(void *param) return REDRAW; } -int top10_menu(void *param) +int show_top10_menu(void *param) { + static int show_top10 = 0; + int ch = 0; + + if (show_top10) + { + return NOREDRAW; + } + show_top10 = 1; + + clearscr(); + show_top("", BBS_name, ""); + show_bottom(""); + + if (display_menu(&top10_menu) == 0) + { + while (!SYS_server_exit) + { + iflush(); + ch = igetch(100); + switch (ch) + { + case KEY_NULL: // broken pipe + show_top10 = 0; + return 0; + case KEY_TIMEOUT: + if (time(NULL) - BBS_last_access_tm >= MAX_DELAY_TIME) + { + show_top10 = 0; + return 0; + } + continue; + case CR: + igetch_reset(); + default: + switch (menu_control(&top10_menu, ch)) + { + case EXITMENU: + ch = EXITMENU; + break; + case REDRAW: + clearscr(); + show_bottom(""); + display_menu(&top10_menu); + break; + case NOREDRAW: + case UNKNOWN_CMD: + default: + break; + } + } + + BBS_last_access_tm = time(NULL); + + if (ch == EXITMENU) + { + break; + } + } + } + + show_top10 = 0; return REDRAW; } int locate_article(void *param) { + char buf[MAX_MENUITEM_NAME_LENGTH]; char *sname, *aid, *saveptr; - sname = strtok_r(param, " ", &saveptr); - aid = strtok_r(NULL, " ", &saveptr); + strncpy(buf, param, sizeof(buf) - 1); + buf[sizeof(buf) - 1] = '\0'; + + sname = strtok_r(buf, "|", &saveptr); + aid = strtok_r(NULL, "|", &saveptr); if (sname == NULL || aid == NULL) { - log_error("top10_locate() error: invalid parameter\n", (const char *)param); + log_error("top10_locate(%s) error: invalid parameter\n", param); return NOREDRAW; } @@ -251,9 +317,10 @@ int locate_article(void *param) int favor_topic(void *param) { - clearscr(); - prints("此功能尚未实现"); - press_any_key(); + if (article_favor_display(&BBS_article_favor) < 0) + { + log_error("article_favor_display() error\n"); + } return REDRAW; }