From 351a6d97df2bd5446aafd2e8b1eb32718de1fb4f Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Mon, 30 Jul 2012 14:51:03 +0200 Subject: [PATCH] Used utf8 character set for mysql --- src/admininterface.cpp | 4 ++-- src/mysqlbackend.cpp | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/admininterface.cpp b/src/admininterface.cpp index e7ac7d0e..3b8a40d1 100644 --- a/src/admininterface.cpp +++ b/src/admininterface.cpp @@ -59,7 +59,7 @@ AdminInterface::~AdminInterface() { } void AdminInterface::handleQuery(Swift::Message::ref message) { - LOG4CXX_INFO(logger, "Message from admin received"); + LOG4CXX_INFO(logger, "Message from admin received: '" << message->getBody() << "'"); message->setTo(message->getFrom()); message->setFrom(m_component->getJID()); @@ -294,7 +294,7 @@ void AdminInterface::handleQuery(Swift::Message::ref message) { message->setBody("User '" + args[1] + "' unregistered."); } else { - message->setBody("Registration failed: User '" + args[1] + "' is not registered"); + message->setBody("Unregistration failed: User '" + args[1] + "' is not registered"); } } else { diff --git a/src/mysqlbackend.cpp b/src/mysqlbackend.cpp index 764af8aa..c5a0e8fa 100644 --- a/src/mysqlbackend.cpp +++ b/src/mysqlbackend.cpp @@ -316,6 +316,10 @@ bool MySQLBackend::connect() { return false; } + if (!mysql_set_character_set(&mysql, "utf8")) { + LOG4CXX_INFO(logger, "New client character set: " << mysql_character_set_name(&mysql)); + } + createDatabase(); m_setUser = new Statement(&m_conn, "sssssbss", "INSERT INTO " + m_prefix + "users (jid, uin, password, language, encoding, last_login, vip) VALUES (?, ?, ?, ?, ?, NOW(), ?) ON DUPLICATE KEY UPDATE uin=?, password=?");