--- lbbs/include/user_priv.h	2025/04/30 09:19:42	1.1
+++ lbbs/include/user_priv.h	2025/11/04 14:58:56	1.9
@@ -1,25 +1,16 @@
-/***************************************************************************
-						  user_priv.h  -  description
-							 -------------------
-	begin                : Mon Oct 22 2004
-	copyright            : (C) 2004 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 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/*
+ * user_priv
+ *   - basic operations of user privilege
+ *
+ * Copyright (C) 2004-2025  Leaflet <leaflet@leafok.com>
+ */
 
 #ifndef _USER_PRIV_H_
 #define _USER_PRIV_H_
 
 #include "bbs.h"
-#include <mysql.h>
+#include <mysql/mysql.h>
 
 // User privilege
 #define S_NONE 0x0
@@ -33,24 +24,25 @@
 #define S_ALL 0xff
 #define S_DEFAULT 0x3 // 0x1 | 0x2
 
-#define P_GUEST 0x0		//游客
-#define P_USER 0x1		//普通用户
-//#define P_AUTH_USER 0x2 // Reserved
-#define P_MAN_S 0x4		//副版主
-#define P_MAN_M 0x8		//正版主
-#define P_MAN_C 0x10	// Reserved
-#define P_ADMIN_S 0x20	//副系统管理员
-#define P_ADMIN_M 0x40	//主系统管理员
+#define P_GUEST 0x0 // 娓稿
+#define P_USER 0x1	// 鏅�氱敤鎴�
+// #define P_AUTH_USER 0x2 // Reserved
+#define P_MAN_S 0x4	   // 鍓増涓�
+#define P_MAN_M 0x8	   // 姝ｇ増涓�
+#define P_MAN_C 0x10   // Reserved
+#define P_ADMIN_S 0x20 // 鍓郴缁熺鐞嗗憳
+#define P_ADMIN_M 0x40 // 涓荤郴缁熺鐞嗗憳
 
 struct user_priv
 {
-	long int uid;
+	int uid;
 	int level;
 	int g_priv;
 	struct
 	{
 		int sid;
 		int s_priv;
+		int is_favor;
 	} s_priv_list[BBS_max_section];
 	int s_count;
 };
@@ -59,14 +51,40 @@ typedef struct user_priv BBS_user_priv;
 
 extern BBS_user_priv BBS_priv;
 
-extern int checklevel(BBS_user_priv *p_priv, int level);
+// Check whether user level matches any bit in the given param
+inline int checklevel(BBS_user_priv *p_priv, int level)
+{
+	if (level == P_GUEST)
+	{
+		return 1;
+	}
+
+	return ((p_priv->level & level) ? 1 : 0);
+}
+
+// Check whether user level is equal or greater than the given param
+inline int checklevel2(BBS_user_priv *p_priv, int level)
+{
+	return ((p_priv->level >= level) ? 1 : 0);
+}
+
+extern int setpriv(BBS_user_priv *p_priv, int sid, int priv, int is_favor);
 
-extern int setpriv(BBS_user_priv *p_priv, int sid, int priv);
+extern int getpriv(BBS_user_priv *p_priv, int sid, int *p_is_favor);
 
-extern int getpriv(BBS_user_priv *p_priv, int sid);
+inline int checkpriv(BBS_user_priv *p_priv, int sid, int priv)
+{
+	int is_favor = 0;
+	return (((getpriv(p_priv, sid, &is_favor) & priv)) == priv ? 1 : 0);
+}
 
-extern int checkpriv(BBS_user_priv *p_priv, int sid, int priv);
+inline int is_favor(BBS_user_priv *p_priv, int sid)
+{
+	int is_favor = 0;
+	getpriv(p_priv, sid, &is_favor);
+	return is_favor;
+}
 
-extern int load_priv(MYSQL *db, BBS_user_priv *p_priv, long int uid);
+extern int load_priv(MYSQL *db, BBS_user_priv *p_priv, int uid);
 
 #endif //_USER_PRIV_H_