--- lbbs/src/database.c	2025/04/28 03:30:59	1.7
+++ lbbs/src/database.c	2025/11/04 13:49:51	1.18
@@ -1,28 +1,28 @@
-/***************************************************************************
-						 database.c  -  description
-							 -------------------
-	begin                : Mon Oct 11 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 */
+/*
+ * database
+ *   - configuration and function of DB connection
+ *
+ * Copyright (C) 2004-2025 by Leaflet <leaflet@leafok.com>
+ */
 
 #include "common.h"
-#include <mysql.h>
+#include "database.h"
+#include "log.h"
 #include <stdio.h>
+#include <mysql/mysql.h>
 
-MYSQL *
-db_open()
+// Global declaration for database
+char DB_host[256];
+char DB_username[50];
+char DB_password[50];
+char DB_database[50];
+char DB_timezone[50];
+
+MYSQL *db_open()
 {
-	MYSQL *db;
+	MYSQL *db = NULL;
+	char sql[SQL_BUFFER_LEN];
 
 	db = mysql_init(NULL);
 	if (db == NULL)
@@ -31,23 +31,29 @@ db_open()
 		return NULL;
 	}
 
-	db = mysql_real_connect(db, DB_host, DB_username, DB_password, DB_database,
-							0, NULL, 0);
-	if (db == NULL)
+	if (mysql_real_connect(db, DB_host, DB_username, DB_password, DB_database,
+						   0, NULL, 0) == NULL)
 	{
-		log_error("mysql_connect() failed\n");
+		log_error("mysql_real_connect() error: %s\n", mysql_error(db));
+		mysql_close(db);
 		return NULL;
 	}
 
-	if (mysql_query(db, "SET CHARACTER SET gb2312") != 0)
+	if (mysql_set_character_set(db, "utf8") != 0)
 	{
-		log_error("SET CHARACTER SET failed\n");
+		log_error("Set character set error: %s\n", mysql_error(db));
+		mysql_close(db);
 		return NULL;
 	}
 
-	if (mysql_query(db, "SET NAMES \'gb2312\'") != 0)
+	snprintf(sql, sizeof(sql),
+			 "SET time_zone = '%s'",
+			 DB_timezone);
+
+	if (mysql_query(db, sql) != 0)
 	{
-		log_error("SET NAMES failed\n");
+		log_error("Set timezone error: %s\n", mysql_error(db));
+		mysql_close(db);
 		return NULL;
 	}