X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_umodes.cpp;h=3132aed4016685a9cc97948ecb1f3f5139acbbc9;hb=4047a143fc1d16350db70c94b9ea77d79de05714;hp=0b708641e9124219ce66a5f9855c7f763a3b6e38;hpb=7851faac62d7a83c94cd5d37e0109b5d0a152bf9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp index 0b708641e..3132aed40 100644 --- a/src/modules/m_conn_umodes.cpp +++ b/src/modules/m_conn_umodes.cpp @@ -38,30 +38,22 @@ class ModuleModesOnConnect : public Module void OnUserConnect(LocalUser* user) CXX11_OVERRIDE { - // Backup and zero out the disabled usermodes, so that we can override them here. - char save[64]; - memcpy(save, ServerInstance->Config->DisabledUModes, - sizeof(ServerInstance->Config->DisabledUModes)); - memset(ServerInstance->Config->DisabledUModes, 0, 64); - ConfigTag* tag = user->MyClass->config; std::string ThisModes = tag->getString("modes"); if (!ThisModes.empty()) { std::string buf; - std::stringstream ss(ThisModes); + irc::spacesepstream ss(ThisModes); - std::vector modes; + CommandBase::Params modes; modes.push_back(user->nick); // split ThisUserModes into modes and mode params - while (ss >> buf) + while (ss.GetToken(buf)) modes.push_back(buf); ServerInstance->Parser.CallHandler("MODE", modes, user); } - - memcpy(ServerInstance->Config->DisabledUModes, save, 64); } };