--- lbbs/src/article_post.c	2025/06/15 00:02:40	1.13
+++ lbbs/src/article_post.c	2025/06/15 04:46:19	1.17
@@ -81,7 +81,8 @@ int article_post(const SECTION_LIST *p_s
 	if (p_editor_data == NULL)
 	{
 		log_error("editor_data_load() error\n");
-		return -2;
+		ret = -1;
+		goto cleanup;
 	}
 
 	// Set title and sign
@@ -212,7 +213,7 @@ int article_post(const SECTION_LIST *p_s
 	if (len_content < 0)
 	{
 		log_error("editor_data_save() error\n");
-		ret = -2;
+		ret = -1;
 		goto cleanup;
 	}
 
@@ -377,6 +378,9 @@ int article_post(const SECTION_LIST *p_s
 		goto cleanup;
 	}
 
+	mysql_close(db);
+	db = NULL;
+
 	clearscr();
 	moveto(1, 1);
 	prints("发送完成，新文章通常会在%d秒后可见", BBS_section_list_load_interval);
@@ -429,21 +433,12 @@ int article_modify(const SECTION_LIST *p
 		return 0;
 	}
 
-	if (!checkpriv(&BBS_priv, p_section->sid, S_POST))
-	{
-		clearscr();
-		moveto(1, 1);
-		prints("您没有权限在本版块发表文章\n");
-		press_any_key();
-
-		return 0;
-	}
-
 	db = db_open();
 	if (db == NULL)
 	{
 		log_error("db_open() error: %s\n", mysql_error(db));
-		return -1;
+		ret = -1;
+		goto cleanup;
 	}
 
 	snprintf(sql, sizeof(sql),
@@ -455,13 +450,13 @@ int article_modify(const SECTION_LIST *p
 	if (mysql_query(db, sql) != 0)
 	{
 		log_error("Query article content error: %s\n", mysql_error(db));
-		ret = -2;
+		ret = -1;
 		goto cleanup;
 	}
 	if ((rs = mysql_use_result(db)) == NULL)
 	{
 		log_error("Get article content data failed\n");
-		ret = -2;
+		ret = -1;
 		goto cleanup;
 	}
 
@@ -485,7 +480,7 @@ int article_modify(const SECTION_LIST *p
 		if (p_editor_data == NULL)
 		{
 			log_error("editor_data_load(aid=%d, cid=%d) error\n", p_article->aid, atoi(row[0]));
-			ret = -3;
+			ret = -1;
 			goto cleanup;
 		}
 
@@ -544,7 +539,7 @@ int article_modify(const SECTION_LIST *p
 	if (len_content < 0)
 	{
 		log_error("editor_data_save() error\n");
-		ret = -2;
+		ret = -1;
 		goto cleanup;
 	}
 
@@ -623,7 +618,7 @@ int article_modify(const SECTION_LIST *p
 
 	// Update article
 	snprintf(sql, sizeof(sql),
-			 "UPDATE bbs SET CID = %d, length = %ld WHERE AID = %d",
+			 "UPDATE bbs SET CID = %d, length = %ld, excerption = 0 WHERE AID = %d", // Set excerption = 0 explictly in case of rare condition
 			 p_article_new->cid, len_content, p_article->aid);
 
 	if (mysql_query(db, sql) != 0)
@@ -661,6 +656,9 @@ int article_modify(const SECTION_LIST *p
 		goto cleanup;
 	}
 
+	mysql_close(db);
+	db = NULL;
+
 	clearscr();
 	moveto(1, 1);
 	prints("修改完成，新内容通常会在%d秒后可见", BBS_section_list_load_interval);
@@ -705,6 +703,7 @@ int article_reply(const SECTION_LIST *p_
 	long quote_content_lines;
 	long i;
 	long ret = 0;
+	int topic_locked = 0;
 
 	if (p_section == NULL || p_article == NULL)
 	{
@@ -721,16 +720,6 @@ int article_reply(const SECTION_LIST *p_
 		return 0;
 	}
 
-	if (p_article->lock) // Reply is not allowed
-	{
-		clearscr();
-		moveto(1, 1);
-		prints("该文章谢绝回复");
-		press_any_key();
-
-		return 0;
-	}
-
 	p_article_new->title[0] = '\0';
 	snprintf(title_input, sizeof(title_input), "Re: %s", p_article->title);
 	len = split_line(title_input, TITLE_INPUT_MAX_LEN, &eol, &display_len);
@@ -740,7 +729,48 @@ int article_reply(const SECTION_LIST *p_
 	if (db == NULL)
 	{
 		log_error("db_open() error: %s\n", mysql_error(db));
-		return -1;
+		ret = -1;
+		goto cleanup;
+	}
+
+	snprintf(sql, sizeof(sql),
+			 "SELECT `lock` FROM bbs WHERE AID = %d",
+			 (p_article->tid == 0 ? p_article->aid : p_article->tid));
+
+	if (mysql_query(db, sql) != 0)
+	{
+		log_error("Query article status error: %s\n", mysql_error(db));
+		ret = -1;
+		goto cleanup;
+	}
+	if ((rs = mysql_store_result(db)) == NULL)
+	{
+		log_error("Get article status data failed\n");
+		ret = -1;
+		goto cleanup;
+	}
+
+	if ((row = mysql_fetch_row(rs)))
+	{
+		if (atoi(row[0]) != 0)
+		{
+			topic_locked = 1;
+		}
+	}
+	mysql_free_result(rs);
+	rs = NULL;
+
+	if (topic_locked) // Reply is not allowed
+	{
+		mysql_close(db);
+		db = NULL;
+		
+		clearscr();
+		moveto(1, 1);
+		prints("该主题谢绝回复");
+		press_any_key();
+
+		goto cleanup;
 	}
 
 	snprintf(sql, sizeof(sql),
@@ -752,12 +782,14 @@ int article_reply(const SECTION_LIST *p_
 	if (mysql_query(db, sql) != 0)
 	{
 		log_error("Query article content error: %s\n", mysql_error(db));
-		return -2;
+		ret = -1;
+		goto cleanup;
 	}
 	if ((rs = mysql_use_result(db)) == NULL)
 	{
 		log_error("Get article content data failed\n");
-		return -2;
+		ret = -1;
+		goto cleanup;
 	}
 
 	if ((row = mysql_fetch_row(rs)))
@@ -811,7 +843,7 @@ int article_reply(const SECTION_LIST *p_
 		if (p_editor_data == NULL)
 		{
 			log_error("editor_data_load(aid=%d, cid=%d) error\n", p_article->aid, atoi(row[0]));
-			ret = -3;
+			ret = -1;
 			goto cleanup;
 		}
 
@@ -946,7 +978,7 @@ int article_reply(const SECTION_LIST *p_
 	if (len_content < 0)
 	{
 		log_error("editor_data_save() error\n");
-		ret = -2;
+		ret = -1;
 		goto cleanup;
 	}
 
@@ -1127,6 +1159,9 @@ int article_reply(const SECTION_LIST *p_
 		goto cleanup;
 	}
 
+	mysql_close(db);
+	db = NULL;
+
 	clearscr();
 	moveto(1, 1);
 	prints("发送完成，新文章通常会在%d秒后可见", BBS_section_list_load_interval);