--- lbbs/src/user_priv.c 2025/05/30 00:58:02 1.16 +++ lbbs/src/user_priv.c 2025/05/30 02:56:02 1.17 @@ -25,11 +25,11 @@ BBS_user_priv BBS_priv; -int setpriv(BBS_user_priv *p_priv, int sid, int priv) +int setpriv(BBS_user_priv *p_priv, int sid, int priv, int is_favor) { int left = 0; int right = p_priv->s_count - 1; - int mid; + int mid = 0; if (sid == 0) { @@ -51,9 +51,10 @@ int setpriv(BBS_user_priv *p_priv, int s } } - if (sid == p_priv->s_priv_list[left].sid) // found + if (left == right && sid == p_priv->s_priv_list[left].sid) // found { p_priv->s_priv_list[left].s_priv = priv; + p_priv->s_priv_list[left].is_favor = is_favor; return 0; } @@ -68,17 +69,21 @@ int setpriv(BBS_user_priv *p_priv, int s { p_priv->s_priv_list[right + 1] = p_priv->s_priv_list[right]; } + p_priv->s_count++; + // insert new item at offset left + p_priv->s_priv_list[left].sid = sid; p_priv->s_priv_list[left].s_priv = priv; + p_priv->s_priv_list[left].is_favor = is_favor; return 0; } -int getpriv(BBS_user_priv *p_priv, int sid) +int getpriv(BBS_user_priv *p_priv, int sid, int *p_is_favor) { int left = 0; int right = p_priv->s_count - 1; - int mid; + int mid = 0; while (left < right) { @@ -94,11 +99,17 @@ int getpriv(BBS_user_priv *p_priv, int s } } - if (sid == p_priv->s_priv_list[left].sid) // found + if (left == right && sid == p_priv->s_priv_list[left].sid) // found { + *p_is_favor = p_priv->s_priv_list[left].is_favor; return p_priv->s_priv_list[left].s_priv; } + if (sid != 0) + { + *p_is_favor = 0; + } + return (sid >= 0 ? p_priv->g_priv : S_NONE); } @@ -107,6 +118,8 @@ int load_priv(MYSQL *db, BBS_user_priv * MYSQL_RES *rs; MYSQL_ROW row; char sql[SQL_BUFFER_LEN]; + int priv; + int is_favor; p_priv->uid = uid; p_priv->level = (uid == 0 ? P_GUEST : P_USER); @@ -117,7 +130,8 @@ int load_priv(MYSQL *db, BBS_user_priv * return 1; // Permission - snprintf(sql, sizeof(sql), "SELECT p_post, p_msg FROM user_list WHERE UID = %ld AND verified", + snprintf(sql, sizeof(sql), + "SELECT p_post, p_msg FROM user_list WHERE UID = %ld AND verified", uid); if (mysql_query(db, sql) != 0) { @@ -137,8 +151,9 @@ int load_priv(MYSQL *db, BBS_user_priv * mysql_free_result(rs); // Admin - snprintf(sql, sizeof(sql), "SELECT major FROM admin_config WHERE UID = %ld " - "AND enable AND (NOW() BETWEEN begin_dt AND end_dt)", + snprintf(sql, sizeof(sql), + "SELECT major FROM admin_config WHERE UID = %ld " + "AND enable AND (NOW() BETWEEN begin_dt AND end_dt)", uid); if (mysql_query(db, sql) != 0) { @@ -158,10 +173,11 @@ int load_priv(MYSQL *db, BBS_user_priv * mysql_free_result(rs); // Section Master - snprintf(sql, sizeof(sql), "SELECT section_master.SID, major FROM section_master " - "INNER JOIN section_config ON section_master.SID = section_config.SID " - "WHERE UID = %ld AND section_master.enable AND section_config.enable " - "AND (NOW() BETWEEN begin_dt AND end_dt)", + snprintf(sql, sizeof(sql), + "SELECT section_master.SID, major FROM section_master " + "INNER JOIN section_config ON section_master.SID = section_config.SID " + "WHERE UID = %ld AND section_master.enable AND section_config.enable " + "AND (NOW() BETWEEN begin_dt AND end_dt)", uid); if (mysql_query(db, sql) != 0) { @@ -176,15 +192,17 @@ int load_priv(MYSQL *db, BBS_user_priv * while ((row = mysql_fetch_row(rs))) { p_priv->level |= (atoi(row[1]) ? P_MAN_M : P_MAN_S); - setpriv(p_priv, atoi(row[0]), getpriv(p_priv, atoi(row[0])) | (atoi(row[1]) ? S_MAN_M : S_MAN_S)); + priv = (getpriv(p_priv, atoi(row[0]), &is_favor) | (atoi(row[1]) ? S_MAN_M : S_MAN_S)); + setpriv(p_priv, atoi(row[0]), priv, is_favor); } mysql_free_result(rs); // Section status - snprintf(sql, sizeof(sql), "SELECT SID, exp_get, read_user_level, write_user_level FROM section_config " - "INNER JOIN section_class ON section_config.CID = section_class.CID " - "WHERE section_config.enable AND section_class.enable " - "ORDER BY SID"); + snprintf(sql, sizeof(sql), + "SELECT SID, exp_get, read_user_level, write_user_level FROM section_config " + "INNER JOIN section_class ON section_config.CID = section_class.CID " + "WHERE section_config.enable AND section_class.enable " + "ORDER BY SID"); if (mysql_query(db, sql) != 0) { log_error("Query section_config error: %s\n", mysql_error(db)); @@ -197,7 +215,7 @@ int load_priv(MYSQL *db, BBS_user_priv * } while ((row = mysql_fetch_row(rs))) { - int priv = getpriv(p_priv, atoi(row[0])); + int priv = getpriv(p_priv, atoi(row[0]), &is_favor); if (p_priv->level < atoi(row[2])) { priv &= (~S_LIST); @@ -210,13 +228,14 @@ int load_priv(MYSQL *db, BBS_user_priv * { priv &= (~S_GETEXP); } - setpriv(p_priv, atoi(row[0]), priv); + setpriv(p_priv, atoi(row[0]), priv, is_favor); } mysql_free_result(rs); // Section ban - snprintf(sql, sizeof(sql), "SELECT SID FROM ban_user_list WHERE UID = %ld AND enable " - "AND (NOW() BETWEEN ban_dt AND unban_dt)", + snprintf(sql, sizeof(sql), + "SELECT SID FROM ban_user_list WHERE UID = %ld AND enable " + "AND (NOW() BETWEEN ban_dt AND unban_dt)", uid); if (mysql_query(db, sql) != 0) { @@ -230,8 +249,33 @@ int load_priv(MYSQL *db, BBS_user_priv * } while ((row = mysql_fetch_row(rs))) { - setpriv(p_priv, atoi(row[0]), - getpriv(p_priv, atoi(row[0])) & (~S_POST)); + priv = getpriv(p_priv, atoi(row[0]), &is_favor) & (~S_POST); + setpriv(p_priv, atoi(row[0]), priv, is_favor); + } + mysql_free_result(rs); + + // User favor section + snprintf(sql, sizeof(sql), + "SELECT SID FROM section_favorite WHERE UID = %ld", + uid); + if (mysql_query(db, sql) != 0) + { + log_error("Query section_favorite error: %s\n", mysql_error(db)); + return -1; + } + if ((rs = mysql_store_result(db)) == NULL) + { + log_error("Get section_favorite data failed\n"); + return -1; + } + while ((row = mysql_fetch_row(rs))) + { + priv = getpriv(p_priv, atoi(row[0]), &is_favor); + if (!is_favor) + { + setpriv(p_priv, atoi(row[0]), priv, 1); + priv = getpriv(p_priv, atoi(row[0]), &is_favor); + } } mysql_free_result(rs);