X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=7f9c2e77cf0111bc31bee84b8b102cb71dc39fbc;hb=f51d9ad5ab7015f78a29039ca7ed169b281ff6bb;hp=66e1898d37442db6094aaaa5571f1d3fb81742fd;hpb=f07a2aa0866a8f953b41ba21592919f05d3a315e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index 66e1898d3..7f9c2e77c 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -2,24 +2,15 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "hashcomp.h" #include "inspircd.h" /* $ModDesc: Povides support for ircu-style services accounts, including chmode +R, etc. */ @@ -31,7 +22,7 @@ class AChannel_R : public ModeHandler public: 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) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (adding) { @@ -61,7 +52,7 @@ class AUser_R : public ModeHandler public: 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) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (adding) { @@ -91,7 +82,7 @@ class AChannel_M : public ModeHandler public: 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) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (adding) { @@ -121,47 +112,50 @@ class ModuleServicesAccount : public Module AChannel_M* m2; AUser_R* m3; public: - ModuleServicesAccount(InspIRCd* Me) : Module::Module(Me) + ModuleServicesAccount(InspIRCd* Me) : Module(Me) { 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'); + if (!ServerInstance->Modes->AddMode(m1) || !ServerInstance->Modes->AddMode(m2) || !ServerInstance->Modes->AddMode(m3)) + throw ModuleException("Could not add new modes!"); + + Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin, + I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup, I_OnDecodeMetaData }; + + ServerInstance->Modules->Attach(eventlist, this, 8); } /* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */ - virtual void OnWhois(userrec* source, userrec* dest) + virtual void OnWhois(User* source, User* dest) { std::string *account; dest->GetExt("accountname", account); if (account) { - source->WriteServ("330 %s %s %s :is logged in as", source->nick, dest->nick, account->c_str()); + ServerInstance->SendWhoisLine(source, dest, 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_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) + virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { std::string *account; + + if (!IS_LOCAL(user)) + return 0; + user->GetExt("accountname", account); if (target_type == TYPE_CHANNEL) { - chanrec* c = (chanrec*)dest; + Channel* c = (Channel*)dest; if ((c->IsModeSet('M')) && (!account)) { - if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)) || (!strcmp(user->server,""))) + if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server))) { // user is ulined, can speak regardless return 0; @@ -174,7 +168,7 @@ class ModuleServicesAccount : public Module } if (target_type == TYPE_USER) { - userrec* u = (userrec*)dest; + User* u = (User*)dest; if ((u->modes['R'-65]) && (!account)) { @@ -192,12 +186,12 @@ class ModuleServicesAccount : public Module return 0; } - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status) + virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { - return OnUserPreMessage(user, dest, target_type, text, status); + return OnUserPreMessage(user, dest, target_type, text, status, exempt_list); } - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) + virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs) { std::string *account; user->GetExt("accountname", account); @@ -223,11 +217,11 @@ class ModuleServicesAccount : public Module } // Whenever the linking module wants to send out data, but doesnt know what the data - // represents (e.g. it is metadata, added to a userrec or chanrec by a module) then + // represents (e.g. it is metadata, added to a User or Channel by a module) then // this method is called. We should use the ProtoSendMetaData function after we've // corrected decided how the data should look, to send the metadata on its way if // it is ours. - virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname) + virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable) { // check if the linking module wants to know about OUR metadata if (extname == "accountname") @@ -237,6 +231,9 @@ class ModuleServicesAccount : public Module user->GetExt("accountname", account); if (account) { + // remove any accidental leading/trailing spaces + trim(*account); + // 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); @@ -245,7 +242,7 @@ class ModuleServicesAccount : public Module } // when a user quits, tidy up their metadata - virtual void OnUserQuit(userrec* user, const std::string &message) + virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message) { std::string* account; user->GetExt("accountname", account); @@ -261,7 +258,7 @@ class ModuleServicesAccount : public Module { if (target_type == TYPE_USER) { - userrec* user = (userrec*)item; + User* user = (User*)item; std::string* account; user->GetExt("accountname", account); if (account) @@ -284,9 +281,10 @@ class ModuleServicesAccount : public Module // check if its our metadata key, and its associated with a user if ((target_type == TYPE_USER) && (extname == "accountname")) { - userrec* dest = (userrec*)target; + User* dest = (User*)target; + /* logging them out? */ - if (extdata == "") + if (extdata.empty()) { std::string* account; dest->GetExt("accountname", account); @@ -303,6 +301,8 @@ class ModuleServicesAccount : public Module if (!dest->GetExt("accountname", text)) { text = new std::string(extdata); + // remove any accidental leading/trailing spaces + trim(*text); dest->Extend("accountname", text); } } @@ -314,38 +314,15 @@ class ModuleServicesAccount : public Module ServerInstance->Modes->DelMode(m1); ServerInstance->Modes->DelMode(m2); ServerInstance->Modes->DelMode(m3); - DELETE(m1); - DELETE(m2); - DELETE(m3); + delete m1; + delete m2; + delete m3; } virtual Version GetVersion() { - return Version(1,0,0,0,VF_COMMON|VF_VENDOR); + return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION); } }; - -class ModuleServicesAccountFactory : public ModuleFactory -{ - public: - ModuleServicesAccountFactory() - { - } - - ~ModuleServicesAccountFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleServicesAccount(Me); - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleServicesAccountFactory; -} +MODULE_INIT(ModuleServicesAccount)