X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_close.cpp;h=a2e9692cdbf2c38b7c814d2fd01f33e26bd139b5;hb=de25d946733f774e3a5b53a58438a9c92af0acbe;hp=1520c9df4f063045180599e69e9dc2f5cfab45e6;hpb=2630a87bb13b089e6d0fdcff4bcd0f3a9612e52f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp index 1520c9df4..a2e9692cd 100644 --- a/src/modules/m_close.cpp +++ b/src/modules/m_close.cpp @@ -29,21 +29,22 @@ class CommandClose : public Command { public: /* Command 'close', needs operator */ - CommandClose (InspIRCd* Instance) : Command(Instance,"CLOSE", "o", 0) + CommandClose(Module* Creator) : Command(Creator,"CLOSE", 0) { - this->source = "m_close.so"; - } + flags_needed = 'o'; } - CmdResult Handle (const std::vector ¶meters, User *user) + CmdResult Handle (const std::vector ¶meters, User *src) { std::map closed; - for (std::vector::iterator u = ServerInstance->Users->local_users.begin(); u != ServerInstance->Users->local_users.end(); u++) + std::vector::reverse_iterator u = ServerInstance->Users->local_users.rbegin(); + while (u != ServerInstance->Users->local_users.rend()) { - if ((*u)->registered != REG_ALL) + User* user = *u++; + if (user->registered != REG_ALL) { - ServerInstance->Users->QuitUser(*u, "Closing all unknown connections per request"); - std::string key = ConvToStr((*u)->GetIPString())+"."+ConvToStr((*u)->GetServerPort()); + ServerInstance->Users->QuitUser(user, "Closing all unknown connections per request"); + std::string key = ConvToStr(user->GetIPString())+"."+ConvToStr(user->GetServerPort()); closed[key]++; } } @@ -51,15 +52,15 @@ class CommandClose : public Command int total = 0; for (std::map::iterator ci = closed.begin(); ci != closed.end(); ci++) { - user->WriteServ("NOTICE %s :*** Closed %d unknown connection%s from [%s]",user->nick.c_str(),(*ci).second,((*ci).second>1)?"s":"",(*ci).first.c_str()); + src->WriteServ("NOTICE %s :*** Closed %d unknown connection%s from [%s]",src->nick.c_str(),(*ci).second,((*ci).second>1)?"s":"",(*ci).first.c_str()); total += (*ci).second; } if (total) - user->WriteServ("NOTICE %s :*** %i unknown connection%s closed",user->nick.c_str(),total,(total>1)?"s":""); + src->WriteServ("NOTICE %s :*** %i unknown connection%s closed",src->nick.c_str(),total,(total>1)?"s":""); else - user->WriteServ("NOTICE %s :*** No unknown connections found",user->nick.c_str()); + src->WriteServ("NOTICE %s :*** No unknown connections found",src->nick.c_str()); - return CMD_LOCALONLY; + return CMD_SUCCESS; } }; @@ -67,8 +68,8 @@ class ModuleClose : public Module { CommandClose cmd; public: - ModuleClose(InspIRCd* Me) - : Module(Me), cmd(Me) + ModuleClose() + : cmd(this) { ServerInstance->AddCommand(&cmd); } @@ -79,7 +80,7 @@ class ModuleClose : public Module virtual Version GetVersion() { - return Version("$Id$", VF_VENDOR, API_VERSION); + return Version("Provides /CLOSE functionality", VF_VENDOR, API_VERSION); } };