--- lbbs/src/database.c	2004/10/20 07:46:32	1.2
+++ lbbs/src/database.c	2025/11/05 02:06:50	1.20
@@ -1,40 +1,61 @@
-/***************************************************************************
-                         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  Leaflet <leaflet@leafok.com>
+ */
 
-#include "bbs.h"
 #include "common.h"
+#include "database.h"
+#include "log.h"
+#include <stdio.h>
+#include <mysql/mysql.h>
 
-MYSQL *
-db_open ()
+// Global declaration for database
+char DB_host[DB_host_max_len + 1];
+char DB_username[DB_username_max_len + 1];
+char DB_password[DB_password_max_len + 1];
+char DB_database[DB_database_max_len + 1];
+char DB_timezone[DB_timezone_max_len + 1];
+
+MYSQL *db_open()
 {
-  MYSQL *db;
-  
-  db = mysql_init(NULL);
-  if (db == NULL)
-  {
-    log_error("mysql_init() failed\n");
-    return NULL;
-  }
-
-  db = mysql_real_connect(db, DB_host, DB_username, DB_password, DB_database,
-    0, NULL, 0);
-  if (db == NULL)
-  {
-    log_error("mysql_connect() failed\n");
-    return NULL;
-  }
+	MYSQL *db = NULL;
+	char sql[SQL_BUFFER_LEN];
+
+	db = mysql_init(NULL);
+	if (db == NULL)
+	{
+		log_error("mysql_init() failed\n");
+		return NULL;
+	}
+
+	if (mysql_real_connect(db, DB_host, DB_username, DB_password, DB_database,
+						   0, NULL, 0) == NULL)
+	{
+		log_error("mysql_real_connect() error: %s\n", mysql_error(db));
+		mysql_close(db);
+		return NULL;
+	}
+
+	if (mysql_set_character_set(db, "utf8") != 0)
+	{
+		log_error("Set character set error: %s\n", mysql_error(db));
+		mysql_close(db);
+		return NULL;
+	}
+
+	snprintf(sql, sizeof(sql),
+			 "SET time_zone = '%s'",
+			 DB_timezone);
+
+	if (mysql_query(db, sql) != 0)
+	{
+		log_error("Set timezone error: %s\n", mysql_error(db));
+		mysql_close(db);
+		return NULL;
+	}
+
+	return db;
 }