diff options
author | Matthias Schiffer <matthias@gamezock.de> | 2009-05-21 00:42:57 +0200 |
---|---|---|
committer | Matthias Schiffer <matthias@gamezock.de> | 2009-05-21 00:42:57 +0200 |
commit | 9c076d2649ff8c6997c2dec1e1ef4f7359d404ec (patch) | |
tree | 2e73f262998fe27326459c69605554b150eb6c82 /src/Server/RequestHandlers/UserListRequestHandler.cpp | |
parent | 325ee09f8fa61185efd6ec8b64b6432686170ac8 (diff) | |
download | mad-9c076d2649ff8c6997c2dec1e1ef4f7359d404ec.tar mad-9c076d2649ff8c6997c2dec1e1ef4f7359d404ec.zip |
UserBackend-Interface ueberarbeitet
Diffstat (limited to 'src/Server/RequestHandlers/UserListRequestHandler.cpp')
-rw-r--r-- | src/Server/RequestHandlers/UserListRequestHandler.cpp | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/src/Server/RequestHandlers/UserListRequestHandler.cpp b/src/Server/RequestHandlers/UserListRequestHandler.cpp index cd05c12..713753b 100644 --- a/src/Server/RequestHandlers/UserListRequestHandler.cpp +++ b/src/Server/RequestHandlers/UserListRequestHandler.cpp @@ -22,8 +22,6 @@ #include <Net/Exception.h> #include <Common/Logger.h> -#include <boost/bind.hpp> - namespace Mad { namespace Server { namespace RequestHandlers { @@ -44,29 +42,28 @@ void UserListRequestHandler::handlePacket(const Common::XmlPacket &packet) { // TODO Require authentication - if(!UserManager::get()->getUserList(boost::bind(&UserListRequestHandler::userListHandler, this, _1))) { - Common::XmlPacket ret; - ret.setType("Error"); - ret.add("ErrorCode", Net::Exception::NOT_IMPLEMENTED); - - sendPacket(ret); - signalFinished()(); - } -} + boost::shared_ptr<std::map<unsigned long, Common::UserInfo> > info = UserManager::get()->getUserList(); -void UserListRequestHandler::userListHandler(const std::map<unsigned long, Common::UserInfo> &info) { Common::XmlPacket ret; - ret.setType("OK"); - ret.addList("users"); - for(std::map<unsigned long, Common::UserInfo>::const_iterator user = info.begin(); user != info.end(); ++user) { - ret["users"].addEntry(); - Common::XmlPacket::Entry &entry = ret["users"].back(); + if(info) { + ret.setType("OK"); + ret.addList("users"); - entry.add("uid", user->second.getUid()); - entry.add("gid", user->second.getGid()); - entry.add("username", user->second.getUsername()); - entry.add("fullName", user->second.getFullName()); + for(std::map<unsigned long, Common::UserInfo>::iterator user = info->begin(); user != info->end(); ++user) { + ret["users"].addEntry(); + Common::XmlPacket::Entry &entry = ret["users"].back(); + + entry.add("uid", user->second.getUid()); + entry.add("gid", user->second.getGid()); + entry.add("username", user->second.getUsername()); + entry.add("fullName", user->second.getFullName()); + } + } + + else { + ret.setType("Error"); + ret.add("ErrorCode", Net::Exception::NOT_IMPLEMENTED); } sendPacket(ret); |