X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services_account.cpp;h=1f9daf452f16baa3a3c99c167185c56bb801249d;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=6248f6f03bb596f1e613a3dc9fdd7e1109866482;hpb=d0b4bb3811458aa335857514e4cbb95d5c84f433;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index 6248f6f03..1f9daf452 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -2,33 +2,25 @@ * | 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-2007 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 #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. */ -extern InspIRCd* ServerInstance; - +/** Channel mode +R - unidentified users cannot join + */ class AChannel_R : public ModeHandler { public: @@ -57,6 +49,8 @@ class AChannel_R : public ModeHandler } }; +/** User mode +R - unidentified users cannot message + */ class AUser_R : public ModeHandler { public: @@ -85,6 +79,8 @@ class AUser_R : public ModeHandler } }; +/** Channel mode +M - unidentified users cannot message channel + */ class AChannel_M : public ModeHandler { public: @@ -104,7 +100,7 @@ class AChannel_M : public ModeHandler { if (channel->IsModeSet('M')) { - channel->SetMode('M',true); + channel->SetMode('M',false); return MODEACTION_ALLOW; } } @@ -126,14 +122,8 @@ class ModuleServicesAccount : public Module 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'); - } - - virtual void On005Numeric(std::string &output) - { - ServerInstance->ModeGrok->InsertMode(output, "RM", 4); + if (!ServerInstance->AddMode(m1, 'R') || !ServerInstance->AddMode(m2, 'M') || !ServerInstance->AddMode(m3, 'R')) + throw ModuleException("Could not add new modes!"); } /* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */ @@ -144,19 +134,23 @@ class ModuleServicesAccount : public Module 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_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) + virtual int OnUserPreMessage(userrec* 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) @@ -165,7 +159,7 @@ class ModuleServicesAccount : public Module if ((c->IsModeSet('M')) && (!account)) { - if ((ServerInstance->IsUlined(user->nick)) || (ServerInstance->IsUlined(user->server)) || (!strcmp(user->server,""))) + if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server))) { // user is ulined, can speak regardless return 0; @@ -182,7 +176,7 @@ class ModuleServicesAccount : public Module if ((u->modes['R'-65]) && (!account)) { - if ((ServerInstance->IsUlined(user->nick)) || (ServerInstance->IsUlined(user->server))) + if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server))) { // user is ulined, can speak regardless return 0; @@ -196,12 +190,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(userrec* 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) + virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) { std::string *account; user->GetExt("accountname", account); @@ -212,7 +206,7 @@ class ModuleServicesAccount : public Module { if (!account) { - if ((ServerInstance->IsUlined(user->nick)) || (ServerInstance->IsUlined(user->server))) + if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server))) { // user is ulined, won't be stopped from joining return 0; @@ -249,7 +243,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(userrec* user, const std::string &message, const std::string &oper_message) { std::string* account; user->GetExt("accountname", account); @@ -289,8 +283,9 @@ class ModuleServicesAccount : public Module if ((target_type == TYPE_USER) && (extname == "accountname")) { userrec* dest = (userrec*)target; + /* logging them out? */ - if (extdata == "") + if (extdata.empty()) { std::string* account; dest->GetExt("accountname", account); @@ -315,6 +310,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); @@ -322,7 +320,7 @@ class ModuleServicesAccount : public Module virtual Version GetVersion() { - return Version(1,0,0,0,VF_STATIC|VF_VENDOR); + return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION); } };