diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php index f1be21a3fdd..9833fc32eae 100644 --- a/htdocs/core/db/mysqli.class.php +++ b/htdocs/core/db/mysqli.class.php @@ -121,8 +121,10 @@ class DoliDBMysqli extends DoliDB $disableforcecharset = 0; // Set to 1 to test without charset forcing if (empty($disableforcecharset) && $this->db->character_set_name() != $clientmustbe) { try { - //print "You should set the \$dolibarr_main_db_character_set and \$dolibarr_main_db_collation for the PHP to the one of the database ".$this->db->character_set_name(); - dol_syslog(get_class($this)."::DoliDBMysqli You should set the \$dolibarr_main_db_character_set and \$dolibarr_main_db_collation for the PHP to the one of the database ".$this->db->character_set_name(), LOG_WARNING); + //print "You should set the \$dolibarr_main_db_character_set and \$dolibarr_main_db_collation for the PHP to the one of the database, so to ".$this->db->character_set_name(); + dol_syslog(get_class($this)."::DoliDBMysqli You should set the \$dolibarr_main_db_character_set and \$dolibarr_main_db_collation for the PHP to the one of the database, so to ".$this->db->character_set_name(), LOG_WARNING); + // + $this->db->set_charset($clientmustbe); // This set charset, but with a bad collation } catch (Exception $e) { print 'Failed to force character_set_client to '.$clientmustbe." (according to setup) to match the one of the server database.
\n"; diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php index 5ff5b4968b5..a47234838fa 100644 --- a/htdocs/core/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -200,6 +200,9 @@ function dolDecrypt($chain, $key = '') //var_dump('key='.$key); $reg = array(); if (preg_match('/^dolcrypt:([^:]+):(.+)$/', $chain, $reg)) { + // Do not enable this log, except during debug + //dol_syslog("We try to decrypt the chain: ".$chain, LOG_DEBUG); + $ciphering = $reg[1]; if (function_exists('openssl_decrypt')) { if (empty($key)) {