X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=64ea36c48dcfd531f72c894589cd82f72752956e;hb=2c6c072c1f5f19d1471feb43fa94bba0030e5fb6;hp=62e9baf17f8429b94b64dab762db821ffda212cf;hpb=bf58f3140ebe17652e30a0d01d3b4bc367ee6c32;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index 62e9baf17..64ea36c48 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -5,7 +5,7 @@ * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * - * + * * * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see @@ -26,18 +26,106 @@ using namespace std; /* $ModDesc: Povides support for ircu-style services accounts, including chmode +R, etc. */ +class AChannel_R : public ModeHandler +{ + public: + AChannel_R() : ModeHandler('R', 0, 0, false, MODETYPE_CHANNEL, false) { } + + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + { + if (adding) + { + if (!channel->IsModeSet('R')) + { + channel->SetMode('R',true); + return MODEACTION_ALLOW; + } + } + else + { + if (channel->IsModeSet('R')) + { + channel->SetMode('R',false); + return MODEACTION_ALLOW; + } + } + + return MODEACTION_DENY; + } +}; + +class AUser_R : public ModeHandler +{ + public: + AUser_R() : ModeHandler('R', 0, 0, false, MODETYPE_USER, false) { } + + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + { + if (adding) + { + if (!dest->IsModeSet('R')) + { + dest->SetMode('R',true); + return MODEACTION_ALLOW; + } + } + else + { + if (dest->IsModeSet('R')) + { + dest->SetMode('R',false); + return MODEACTION_ALLOW; + } + } + + return MODEACTION_DENY; + } +}; + +class AChannel_M : public ModeHandler +{ + public: + AChannel_M() : ModeHandler('M', 0, 0, false, MODETYPE_CHANNEL, false) { } + + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + { + if (adding) + { + if (!channel->IsModeSet('M')) + { + channel->SetMode('M',true); + return MODEACTION_ALLOW; + } + } + else + { + if (channel->IsModeSet('M')) + { + channel->SetMode('M',true); + return MODEACTION_ALLOW; + } + } + + return MODEACTION_DENY; + } +}; + class ModuleServicesAccount : public Module { Server *Srv; - + AChannel_R* m1; + AChannel_M* m2; + AUser_R* m3; public: ModuleServicesAccount(Server* Me) : Module::Module(Me) { Srv = Me; - - Srv->AddExtendedMode('R',MT_CHANNEL,false,0,0); - Srv->AddExtendedMode('R',MT_CLIENT,false,0,0); - Srv->AddExtendedMode('M',MT_CHANNEL,false,0,0); + 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) @@ -48,41 +136,25 @@ class ModuleServicesAccount : public Module /* <- :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()); + WriteServ(source->fd, "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_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1; + List[I_OnWhois] = List[I_OnUserPreMessage] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1; List[I_OnSyncUserMetaData] = List[I_OnUserQuit] = List[I_OnCleanup] = List[I_OnDecodeMetaData] = 1; } - virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list ¶ms) - { - if (modechar == 'R') - { - return 1; - } - else if (modechar == 'M') - { - if (type == MT_CHANNEL) - { - return 1; - } - } - - return 0; - } - 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) { @@ -105,7 +177,7 @@ class ModuleServicesAccount : public Module { userrec* u = (userrec*)dest; - if ((strchr(u->modes,'R')) && (!account)) + if ((u->modes['R'-65]) && (!account)) { if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server))) { @@ -128,7 +200,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) { @@ -161,11 +234,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); @@ -176,10 +248,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; } @@ -191,10 +263,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; } @@ -217,10 +289,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; } @@ -228,10 +300,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); } } } @@ -239,6 +312,9 @@ class ModuleServicesAccount : public Module virtual ~ModuleServicesAccount() { + DELETE(m1); + DELETE(m2); + DELETE(m3); } virtual Version GetVersion()