X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_jumpserver.cpp;h=b754b29605b3a8d6745c458977752671dcdd7e60;hb=e9e75e50bc25e67af22dd88b39b12217a553d5cb;hp=2d304ab74c95647e28f0277b7e06e5b0a7149e7b;hpb=b5159b7a927dc5b7162bedfc5b2b140b6055fef1;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp index 2d304ab74..b754b2960 100644 --- a/src/modules/m_jumpserver.cpp +++ b/src/modules/m_jumpserver.cpp @@ -99,10 +99,10 @@ class CommandJumpserver : public Command if (redirect_all_immediately) { /* Redirect everyone but the oper sending the command */ - for (std::vector::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++) + for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); ++i) { User* t = *i; - if (!IS_OPER(t)) + if (!t->IsOper()) { t->WriteNumeric(10, "%s %s %s :Please use this Server/Port instead", t->nick.c_str(), parameters[0].c_str(), parameters[1].c_str()); ServerInstance->Users->QuitUser(t, reason); @@ -134,20 +134,19 @@ class CommandJumpserver : public Command } }; - class ModuleJumpServer : public Module { CommandJumpserver js; public: ModuleJumpServer() : js(this) { - ServerInstance->AddCommand(&js); - Implementation eventlist[] = { I_OnUserRegister, I_OnRehash }; - ServerInstance->Modules->Attach(eventlist, this, 2); } - virtual ~ModuleJumpServer() + void init() { + ServerInstance->Modules->AddService(js); + Implementation eventlist[] = { I_OnUserRegister, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } virtual ModResult OnUserRegister(LocalUser* user) @@ -172,7 +171,6 @@ class ModuleJumpServer : public Module { return Version("Provides support for the RPL_REDIR numeric and the /JUMPSERVER command.", VF_VENDOR); } - }; MODULE_INIT(ModuleJumpServer)