From 63a7b8eef57272f6324d5bbbc96a302dcf6603d9 Mon Sep 17 00:00:00 2001 From: HanzZ Date: Mon, 4 Apr 2011 20:36:51 +0200 Subject: [PATCH] Store user into DB to be able to store avatars, but don't store password in server mode --- src/usermanager.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/usermanager.cpp b/src/usermanager.cpp index f4660d4b..64656099 100644 --- a/src/usermanager.cpp +++ b/src/usermanager.cpp @@ -95,16 +95,18 @@ void UserManager::handlePresence(Swift::Presence::ref presence) { UserInfo res; bool registered = m_storageBackend->getUser(userkey, res); - if (!registered && m_component->inServerMode()) { - res.password = m_component->getUserRegistryPassword(userkey); - res.uin = presence->getFrom().getNode(); - res.jid = userkey; - if (res.uin.find_last_of("%") != std::string::npos) { - res.uin.replace(res.uin.find_last_of("%"), 1, "@"); + if (m_component->inServerMode()) { + if (!registered) { + res.password = ""; + res.uin = presence->getFrom().getNode(); + res.jid = userkey; + if (res.uin.find_last_of("%") != std::string::npos) { + res.uin.replace(res.uin.find_last_of("%"), 1, "@"); + } + m_storageBackend->setUser(res); + registered = m_storageBackend->getUser(userkey, res); } -// m_storageBackend->setUser(res); -// registered = m_storageBackend->getUser(userkey, res); - registered = true; + res.password = m_component->getUserRegistryPassword(userkey); } if (!registered) {