X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=739ad611972370045a242fe012f708fcba8dba0a;hb=3a7dd5b129450b94e0a87b8ad5009da70905b8e5;hp=c545e26b69b5eb0be262bcbb5b583be576c5f220;hpb=09afa5085614e0224a296abd082fce205003c3fe;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index c545e26b6..739ad6119 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -16,21 +16,20 @@ using namespace std; -#include #include "users.h" #include "channels.h" #include "modules.h" -#include -#include "helperfuncs.h" #include "hashcomp.h" #include "inspircd.h" /* $ModDesc: Povides support for ircu-style services accounts, including chmode +R, etc. */ +/** Channel mode +R - unidentified users cannot join + */ class AChannel_R : public ModeHandler { public: - AChannel_R() : ModeHandler('R', 0, 0, false, MODETYPE_CHANNEL, false) { } + AChannel_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) { @@ -55,10 +54,12 @@ class AChannel_R : public ModeHandler } }; +/** User mode +R - unidentified users cannot message + */ class AUser_R : public ModeHandler { public: - AUser_R() : ModeHandler('R', 0, 0, false, MODETYPE_USER, false) { } + AUser_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) { @@ -83,10 +84,12 @@ class AUser_R : public ModeHandler } }; +/** Channel mode +M - unidentified users cannot message channel + */ class AChannel_M : public ModeHandler { public: - AChannel_M() : ModeHandler('M', 0, 0, false, MODETYPE_CHANNEL, false) { } + AChannel_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) { @@ -102,7 +105,7 @@ class AChannel_M : public ModeHandler { if (channel->IsModeSet('M')) { - channel->SetMode('M',true); + channel->SetMode('M',false); return MODEACTION_ALLOW; } } @@ -113,25 +116,20 @@ class AChannel_M : public ModeHandler class ModuleServicesAccount : public Module { - Server *Srv; + AChannel_R* m1; AChannel_M* m2; AUser_R* m3; public: - ModuleServicesAccount(Server* Me) : Module::Module(Me) + ModuleServicesAccount(InspIRCd* Me) : Module::Module(Me) { - Srv = Me; - m1 = new AChannel_R(); - m2 = new AChannel_M(); - m3 = new AUser_R(); - Srv->AddMode(m1, 'R'); - Srv->AddMode(m2, 'M'); - Srv->AddMode(m3, 'R'); - } - - virtual void On005Numeric(std::string &output) - { - InsertMode(output, "RM", 4); + + m1 = new AChannel_R(ServerInstance); + m2 = new AChannel_M(ServerInstance); + m3 = new AUser_R(ServerInstance); + ServerInstance->AddMode(m1, 'R'); + ServerInstance->AddMode(m2, 'M'); + ServerInstance->AddMode(m3, 'R'); } /* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */ @@ -148,7 +146,7 @@ class ModuleServicesAccount : public Module void Implements(char* List) { - List[I_OnWhois] = List[I_OnUserPreMessage] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1; + List[I_OnWhois] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1; List[I_OnSyncUserMetaData] = List[I_OnUserQuit] = List[I_OnCleanup] = List[I_OnDecodeMetaData] = 1; } @@ -163,7 +161,7 @@ class ModuleServicesAccount : public Module if ((c->IsModeSet('M')) && (!account)) { - 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; @@ -180,7 +178,7 @@ class ModuleServicesAccount : public Module if ((u->modes['R'-65]) && (!account)) { - 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; @@ -210,7 +208,7 @@ class ModuleServicesAccount : public Module { if (!account) { - 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; @@ -313,6 +311,9 @@ class ModuleServicesAccount : public Module virtual ~ModuleServicesAccount() { + ServerInstance->Modes->DelMode(m1); + ServerInstance->Modes->DelMode(m2); + ServerInstance->Modes->DelMode(m3); DELETE(m1); DELETE(m2); DELETE(m3); @@ -320,7 +321,7 @@ class ModuleServicesAccount : public Module virtual Version GetVersion() { - return Version(1,0,0,0,VF_STATIC|VF_VENDOR); + return Version(1,0,0,0,VF_COMMON|VF_VENDOR); } }; @@ -336,7 +337,7 @@ class ModuleServicesAccountFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleServicesAccount(Me); }