X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services.cpp;h=f32964a44147102612baeffd0a368357d667d602;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=9f5e1bdb7c98ba86b5ebfc3f23799088538a16f0;hpb=fea1a27cb96a114f698eedcf90401b78406108fb;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_services.cpp b/src/modules/m_services.cpp index 9f5e1bdb7..f32964a44 100644 --- a/src/modules/m_services.cpp +++ b/src/modules/m_services.cpp @@ -16,13 +16,10 @@ using namespace std; -#include #include "users.h" #include "channels.h" #include "modules.h" -#include -#include "helperfuncs.h" -#include "hashcomp.h" +#include "inspircd.h" static bool kludgeme = false; @@ -30,22 +27,22 @@ static bool kludgeme = false; class Channel_r : public ModeHandler { - Server* Srv; + public: - Channel_r(Server* srv) : ModeHandler('r', 0, 0, false, MODETYPE_CHANNEL, false), Srv(srv) { } + Channel_r(InspIRCd* Instance) : ModeHandler(Instance, 'r', 0, 0, false, MODETYPE_CHANNEL, false) { } ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { // only a u-lined server may add or remove the +r mode. - if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!*source->server || (strchr(source->nick,'.')))) + if ((ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server || (strchr(source->nick,'.')))) { - log(DEBUG,"Allowing cmode +r, server and nick are: '%s','%s'",source->nick,source->server); + ServerInstance->Log(DEBUG,"Allowing cmode +r, server and nick are: '%s','%s'",source->nick,source->server); channel->SetMode('r',adding); return MODEACTION_ALLOW; } else { - log(DEBUG,"Only a server can set chanmode +r, server and nick are: '%s','%s'",source->nick,source->server); + ServerInstance->Log(DEBUG,"Only a server can set chanmode +r, server and nick are: '%s','%s'",source->nick,source->server); source->WriteServ("500 "+std::string(source->nick)+" :Only a server may modify the +r channel mode"); return MODEACTION_DENY; } @@ -54,21 +51,21 @@ class Channel_r : public ModeHandler class User_r : public ModeHandler { - Server* Srv; + public: - User_r(Server* srv) : ModeHandler('r', 0, 0, false, MODETYPE_USER, false), Srv(srv) { } + User_r(InspIRCd* Instance) : ModeHandler(Instance, 'r', 0, 0, false, MODETYPE_USER, false) { } ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { - if ((kludgeme) || (Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!*source->server || (strchr(source->nick,'.')))) + if ((kludgeme) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server || (strchr(source->nick,'.')))) { - log(DEBUG,"Allowing umode +r, server and nick are: '%s','%s'",source->nick,source->server); + ServerInstance->Log(DEBUG,"Allowing umode +r, server and nick are: '%s','%s'",source->nick,source->server); dest->SetMode('r',adding); return MODEACTION_ALLOW; } else { - log(DEBUG,"Only a server can set umode +r, server and nick are: '%s','%s'",source->nick, source->server); + ServerInstance->Log(DEBUG,"Only a server can set umode +r, server and nick are: '%s','%s'",source->nick, source->server); source->WriteServ("500 "+std::string(source->nick)+" :Only a server may modify the +r user mode"); return MODEACTION_DENY; } @@ -78,7 +75,7 @@ class User_r : public ModeHandler class Channel_R : public ModeHandler { public: - Channel_R() : ModeHandler('R', 0, 0, false, MODETYPE_CHANNEL, false) { } + Channel_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_CHANNEL, false) { } ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { @@ -106,7 +103,7 @@ class Channel_R : public ModeHandler class User_R : public ModeHandler { public: - User_R() : ModeHandler('R', 0, 0, false, MODETYPE_USER, false) { } + User_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_USER, false) { } ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { @@ -134,7 +131,7 @@ class User_R : public ModeHandler class Channel_M : public ModeHandler { public: - Channel_M() : ModeHandler('M', 0, 0, false, MODETYPE_CHANNEL, false) { } + Channel_M(InspIRCd* Instance) : ModeHandler(Instance, 'M', 0, 0, false, MODETYPE_CHANNEL, false) { } ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { @@ -161,35 +158,30 @@ class Channel_M : public ModeHandler class ModuleServices : public Module { - Server *Srv; + Channel_r* m1; Channel_R* m2; Channel_M* m3; User_r* m4; User_R* m5; public: - ModuleServices(Server* Me) + ModuleServices(InspIRCd* Me) : Module::Module(Me) { - Srv = Me; - m1 = new Channel_r(Me); - m2 = new Channel_R(); - m3 = new Channel_M(); - m4 = new User_r(Me); - m5 = new User_R(); - Srv->AddMode(m1, 'r'); - Srv->AddMode(m2, 'R'); - Srv->AddMode(m3, 'M'); - Srv->AddMode(m4, 'r'); - Srv->AddMode(m5, 'R'); + + m1 = new Channel_r(ServerInstance); + m2 = new Channel_R(ServerInstance); + m3 = new Channel_M(ServerInstance); + m4 = new User_r(ServerInstance); + m5 = new User_R(ServerInstance); + ServerInstance->AddMode(m1, 'r'); + ServerInstance->AddMode(m2, 'R'); + ServerInstance->AddMode(m3, 'M'); + ServerInstance->AddMode(m4, 'r'); + ServerInstance->AddMode(m5, 'R'); kludgeme = false; } - virtual void On005Numeric(std::string &output) - { - InsertMode(output, "rRM", 4); - } - /* <- :stitch.chatspike.net 307 w00t w00t :is a registered nick */ virtual void OnWhois(userrec* source, userrec* dest) { @@ -202,7 +194,7 @@ class ModuleServices : public Module void Implements(char* List) { - List[I_OnWhois] = List[I_OnUserPostNick] = List[I_OnUserPreMessage] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1; + List[I_OnWhois] = List[I_OnUserPostNick] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1; } virtual void OnUserPostNick(userrec* user, const std::string &oldnick) @@ -214,7 +206,7 @@ class ModuleServices : public Module modechange[0] = user->nick; modechange[1] = "-r"; kludgeme = true; - Srv->SendMode(modechange,2,user); + ServerInstance->SendMode(modechange,2,user); kludgeme = false; } } @@ -226,7 +218,7 @@ class ModuleServices : public Module chanrec* c = (chanrec*)dest; if ((c->IsModeSet('M')) && (!user->IsModeSet('r'))) { - if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,""))) + if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)) || (!strcmp(user->server,""))) { // user is ulined, can speak regardless return 0; @@ -241,7 +233,7 @@ class ModuleServices : public Module userrec* u = (userrec*)dest; if ((u->IsModeSet('R')) && (user->IsModeSet('r'))) { - if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server))) + if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server))) { // user is ulined, can speak regardless return 0; @@ -267,7 +259,7 @@ class ModuleServices : public Module { if (user->IsModeSet('r')) { - if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server))) + if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server))) { // user is ulined, won't be stopped from joining return 0; @@ -308,7 +300,7 @@ class ModuleServicesFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleServices(Me); }