|
@@ -47,6 +47,11 @@
|
|
* NOT to quote identifiers by setting
|
|
* NOT to quote identifiers by setting
|
|
* this to "none"
|
|
* this to "none"
|
|
*
|
|
*
|
|
|
|
+ * If needed, you can also set $prefs_db_charset as a string
|
|
|
|
+ * (such as "utf8mb4") in config/config_local.php if your system
|
|
|
|
+ * does not default the SQL connection character set as expected
|
|
|
|
+ * (most sensible systems will do the right thing transparently).
|
|
|
|
+ *
|
|
* @copyright 1999-2022 The SquirrelMail Project Team
|
|
* @copyright 1999-2022 The SquirrelMail Project Team
|
|
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
|
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
|
|
* @version $Id$
|
|
* @version $Id$
|
|
@@ -245,7 +250,7 @@ class dbPrefs {
|
|
*
|
|
*
|
|
*/
|
|
*/
|
|
function open() {
|
|
function open() {
|
|
- global $prefs_dsn, $prefs_table, $use_pdo, $db_identifier_quote_char;
|
|
|
|
|
|
+ global $prefs_dsn, $prefs_db_charset, $prefs_table, $use_pdo, $db_identifier_quote_char;
|
|
global $prefs_user_field, $prefs_key_field, $prefs_val_field;
|
|
global $prefs_user_field, $prefs_key_field, $prefs_val_field;
|
|
global $prefs_user_size, $prefs_key_size, $prefs_val_size;
|
|
global $prefs_user_size, $prefs_key_size, $prefs_val_size;
|
|
|
|
|
|
@@ -347,6 +352,8 @@ class dbPrefs {
|
|
$pdo_prefs_dsn = $matches[1] . ':unix_socket=' . $matches[9] . ';dbname=' . $matches[5];
|
|
$pdo_prefs_dsn = $matches[1] . ':unix_socket=' . $matches[9] . ';dbname=' . $matches[5];
|
|
else
|
|
else
|
|
$pdo_prefs_dsn = $matches[1] . ':host=' . $matches[4] . (!empty($matches[6]) ? ';port=' . $matches[6] : '') . ';dbname=' . $matches[5];
|
|
$pdo_prefs_dsn = $matches[1] . ':host=' . $matches[4] . (!empty($matches[6]) ? ';port=' . $matches[6] : '') . ';dbname=' . $matches[5];
|
|
|
|
+ if (!empty($prefs_db_charset))
|
|
|
|
+ $pdo_prefs_dsn .= ';charset=' . $prefs_db_charset;
|
|
try {
|
|
try {
|
|
$dbh = new PDO($pdo_prefs_dsn, $matches[2], $matches[3]);
|
|
$dbh = new PDO($pdo_prefs_dsn, $matches[2], $matches[3]);
|
|
} catch (Exception $e) {
|
|
} catch (Exception $e) {
|
|
@@ -363,6 +370,31 @@ class dbPrefs {
|
|
}
|
|
}
|
|
|
|
|
|
$this->dbh = $dbh;
|
|
$this->dbh = $dbh;
|
|
|
|
+
|
|
|
|
+ // Older versions of PHP are buggy with setting charset on the dsn so we also issue a SET NAMES
|
|
|
|
+ if (!empty($prefs_db_charset)) {
|
|
|
|
+ if ($use_pdo) {
|
|
|
|
+ $res = $dbh->exec('SET NAMES \'' . $prefs_db_charset . '\'');
|
|
|
|
+ /* Purposefully not checking for errors; some setups reportedly botch this on queries like this
|
|
|
|
+ if ($res === FALSE) {
|
|
|
|
+ if ($pdo_show_sql_errors)
|
|
|
|
+ $this->error = implode(' - ', $sth->errorInfo());
|
|
|
|
+ else
|
|
|
|
+ $this->error = _("Could not execute query");
|
|
|
|
+ }
|
|
|
|
+ $this->failQuery();
|
|
|
|
+ */
|
|
|
|
+ }
|
|
|
|
+ else {
|
|
|
|
+ $res = $this->dbh->simpleQuery('SET NAMES \'' . $prefs_db_charset . '\'');
|
|
|
|
+ /* Purposefully not checking for errors; some setups reportedly botch this on queries like this
|
|
|
|
+ if(DB::isError($res)) {
|
|
|
|
+ $this->failQuery($res);
|
|
|
|
+ }
|
|
|
|
+ */
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
|