X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=739ad611972370045a242fe012f708fcba8dba0a;hb=3a7dd5b129450b94e0a87b8ad5009da70905b8e5;hp=2fceb6780409087636f493fb9b6b8eacdaaf6b7f;hpb=cd767403e9cce6cc0749160fddb9e7c82042d23c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index 2fceb6780..739ad6119 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -16,20 +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) { @@ -54,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) { @@ -82,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) { @@ -101,7 +105,7 @@ class AChannel_M : public ModeHandler { if (channel->IsModeSet('M')) { - channel->SetMode('M',true); + channel->SetMode('M',false); return MODEACTION_ALLOW; } } @@ -112,48 +116,44 @@ 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 */ virtual void OnWhois(userrec* source, userrec* dest) { - char *account = dest->GetExt("accountname"); + std::string *account; + dest->GetExt("accountname", account); if (account) { - std::string* accountn = (std::string*)account; - WriteServ(source->fd, "330 %s %s %s :is logged in as", source->nick, dest->nick, accountn->c_str()); + source->WriteServ("330 %s %s %s :is logged in as", source->nick, dest->nick, account->c_str()); } } 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; } virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status) { - char *account = user->GetExt("accountname"); + std::string *account; + user->GetExt("accountname", account); if (target_type == TYPE_CHANNEL) { @@ -161,14 +161,14 @@ 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; } // user messaging a +M channel and is not registered - Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(c->name)+" :You need to be identified to a registered account to message this channel"); + user->WriteServ("477 "+std::string(user->nick)+" "+std::string(c->name)+" :You need to be identified to a registered account to message this channel"); return 1; } } @@ -178,14 +178,14 @@ 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; } // user messaging a +R user and is not registered - Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(u->nick)+" :You need to be identified to a registered account to message this user"); + user->WriteServ("477 "+std::string(user->nick)+" "+std::string(u->nick)+" :You need to be identified to a registered account to message this user"); return 1; } } @@ -199,7 +199,8 @@ class ModuleServicesAccount : public Module virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) { - char *account = user->GetExt("accountname"); + std::string *account; + user->GetExt("accountname", account); if (chan) { @@ -207,13 +208,13 @@ 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; } // joining a +R channel and not identified - Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(chan->name)+" :You need to be identified to a registered account to join this channel"); + user->WriteServ("477 "+std::string(user->nick)+" "+std::string(chan->name)+" :You need to be identified to a registered account to join this channel"); return 1; } } @@ -232,11 +233,10 @@ class ModuleServicesAccount : public Module if (extname == "accountname") { // check if this user has an swhois field to send - char* field = user->GetExt("accountname"); - if (field) + std::string* account; + user->GetExt("accountname", account); + if (account) { - // get our extdata out with a cast - std::string* account = (std::string*)field; // call this function in the linking module, let it format the data how it // sees fit, and send it on its way. We dont need or want to know how. proto->ProtoSendMetaData(opaque,TYPE_USER,user,extname,*account); @@ -247,10 +247,10 @@ class ModuleServicesAccount : public Module // when a user quits, tidy up their metadata virtual void OnUserQuit(userrec* user, const std::string &message) { - char* field = user->GetExt("accountname"); - if (field) + std::string* account; + user->GetExt("accountname", account); + if (account) { - std::string* account = (std::string*)field; user->Shrink("accountname"); delete account; } @@ -262,10 +262,10 @@ class ModuleServicesAccount : public Module if (target_type == TYPE_USER) { userrec* user = (userrec*)item; - char* field = user->GetExt("accountname"); - if (field) + std::string* account; + user->GetExt("accountname", account); + if (account) { - std::string* account = (std::string*)field; user->Shrink("accountname"); delete account; } @@ -288,10 +288,10 @@ class ModuleServicesAccount : public Module /* logging them out? */ if (extdata == "") { - char* field = dest->GetExt("accountname"); - if (field) + std::string* account; + dest->GetExt("accountname", account); + if (account) { - std::string* account = (std::string*)field; dest->Shrink("accountname"); delete account; } @@ -299,10 +299,11 @@ class ModuleServicesAccount : public Module else { // if they dont already have an accountname field, accept the remote server's - if (!dest->GetExt("accountname")) + std::string* text; + if (!dest->GetExt("accountname", text)) { - std::string* text = new std::string(extdata); - dest->Extend("accountname",(char*)text); + text = new std::string(extdata); + dest->Extend("accountname", text); } } } @@ -310,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); @@ -317,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); } }; @@ -333,7 +337,7 @@ class ModuleServicesAccountFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleServicesAccount(Me); }