From 35877b13825b2c3db44ff89977344b84f8e21d9a Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Thu, 10 Feb 2022 18:57:44 +0000
Subject: allow to override the DB charset via the $db_charset variable in
 .htconfig.php

---
 include/dba/dba_driver.php | 12 ++++++------
 include/dba/dba_pdo.php    |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'include')

diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index b96601fec..152be7f88 100644
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -38,7 +38,7 @@ class DBA {
 	 * @param bool $install Defaults to false
 	 * @return null|dba_driver A database driver object (dba_pdo) or null if no driver found.
 	 */
-	static public function dba_factory($server,$port,$user,$pass,$db,$dbtype,$install = false) {
+	static public function dba_factory($server,$port,$user,$pass,$db,$dbtype,$db_charset,$install = false) {
 
 		self::$dba = null;
 		self::$dbtype = intval($dbtype);
@@ -65,7 +65,7 @@ class DBA {
 		}
 
 		require_once('include/dba/dba_pdo.php');
-		self::$dba = new dba_pdo($server,self::$scheme,$port,$user,$pass,$db,$install);
+		self::$dba = new dba_pdo($server,self::$scheme,$port,$user,$pass,$db,$db_charset,$install);
 
 		define('NULL_DATE', self::$null_date);
 		define('ACTIVE_DBTYPE', self::$dbtype);
@@ -105,7 +105,7 @@ abstract class dba_driver {
 	 * @param string $db database name
 	 * @return bool
 	 */
-	abstract function connect($server, $scheme, $port, $user, $pass, $db);
+	abstract function connect($server, $scheme, $port, $user, $pass, $db, $db_charset);
 
 	/**
 	 * @brief Perform a DB query with the SQL statement $sql.
@@ -139,11 +139,11 @@ abstract class dba_driver {
 	 */
 	abstract function getdriver();
 
-	function __construct($server, $scheme, $port, $user,$pass,$db,$install = false) {
-		if(($install) && (! $this->install($server, $scheme, $port, $user, $pass, $db))) {
+	function __construct($server, $scheme, $port, $user,$pass,$db,$db_charset,$install = false) {
+		if(($install) && (! $this->install($server, $scheme, $port, $user, $pass, $db, $db_charset))) {
 			return;
 		}
-		$this->connect($server, $scheme, $port, $user, $pass, $db);
+		$this->connect($server, $scheme, $port, $user, $pass, $db, $db_charset);
 	}
 
 	function get_null_date() {
diff --git a/include/dba/dba_pdo.php b/include/dba/dba_pdo.php
index 2137ca0cc..c8a1b6c85 100644
--- a/include/dba/dba_pdo.php
+++ b/include/dba/dba_pdo.php
@@ -14,7 +14,7 @@ class dba_pdo extends dba_driver {
 	 * {@inheritDoc}
 	 * @see dba_driver::connect()
 	 */
-	function connect($server, $scheme, $port, $user, $pass, $db) {
+	function connect($server, $scheme, $port, $user, $pass, $db, $db_charset) {
 
 		$this->driver_dbtype = $scheme;
 
@@ -28,10 +28,10 @@ class dba_pdo extends dba_driver {
 		$dsn .= ';dbname=' . $db;
 
 		if ($this->driver_dbtype === 'mysql') {
-			$dsn .= ';charset=utf8mb4';
+			$dsn .= ';charset=' . $db_charset;
 		}
 		else {
-			$dsn .= ";options='--client_encoding=UTF8'";
+			$dsn .= ";options='--client_encoding=" . $db_charset . "'";
 		}
 
 		try {
-- 
cgit v1.2.3