X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanprotect.cpp;h=a1d58018097021cf1d60239e2703cb81351aa054;hb=aec772bdc98bdcfe35c2fc8e74942403c9efcc4d;hp=04c35bb5a40776aee161fb063b795f5c8e0858fa;hpb=93a5caf71ee92f2edc2ec8ca385785d61f082858;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp index 04c35bb5a..a1d580180 100644 --- a/src/modules/m_chanprotect.cpp +++ b/src/modules/m_chanprotect.cpp @@ -2,14 +2,11 @@ * | 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. + * the file COPYING for details. * * --------------------------------------------------- */ @@ -45,9 +42,9 @@ class FounderProtectBase int end; char* dummyptr; protected: - bool remove_own_privs; + bool& remove_own_privs; public: - FounderProtectBase(InspIRCd* Instance, const std::string &ext, const std::string &mtype, int l, int e, bool remove_own) : + FounderProtectBase(InspIRCd* Instance, const std::string &ext, const std::string &mtype, int l, int e, bool &remove_own) : MyInstance(Instance), extend(ext), type(mtype), list(l), end(e), remove_own_privs(remove_own) { } @@ -166,7 +163,7 @@ class ChanFounder : public ModeHandler, public FounderProtectBase { char* dummyptr; public: - ChanFounder(InspIRCd* Instance, bool using_prefixes, bool depriv_self) + ChanFounder(InspIRCd* Instance, bool using_prefixes, bool &depriv_self) : ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false, using_prefixes ? '~' : 0), FounderProtectBase(Instance, "cm_founder_", "founder", 386, 387, depriv_self) { } @@ -199,7 +196,7 @@ class ChanFounder : public ModeHandler, public FounderProtectBase } // source is a server, or ulined, we'll let them +-q the user. - if ((unload_kludge) || ((source == theuser) && (FounderProtectBase::remove_own_privs)) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server) || (!IS_LOCAL(source))) + if ((unload_kludge) || ((source == theuser) && (!adding) && (FounderProtectBase::remove_own_privs)) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server) || (!IS_LOCAL(source))) { return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); } @@ -224,7 +221,7 @@ class ChanProtect : public ModeHandler, public FounderProtectBase { char* dummyptr; public: - ChanProtect(InspIRCd* Instance, bool using_prefixes, bool depriv_self) + ChanProtect(InspIRCd* Instance, bool using_prefixes, bool &depriv_self) : ModeHandler(Instance, 'a', 1, 1, true, MODETYPE_CHANNEL, false, using_prefixes ? '&' : 0), FounderProtectBase(Instance,"cm_protect_","protected user", 388, 389, depriv_self) { } @@ -293,7 +290,7 @@ class ModuleChanProtect : public Module : Module::Module(Me), FirstInGetsFounder(false), QAPrefixes(false), DeprivSelf(false), booting(true) { /* Load config stuff */ - OnRehash(""); + OnRehash(NULL,""); booting = false; /* Initialise module variables */ @@ -301,8 +298,8 @@ class ModuleChanProtect : public Module cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf); cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf); - ServerInstance->AddMode(cp, 'a'); - ServerInstance->AddMode(cf, 'q'); + if (!ServerInstance->AddMode(cp, 'a') || !ServerInstance->AddMode(cf, 'q')) + throw ModuleException("Could not add new modes!"); } void Implements(char* List) @@ -324,7 +321,7 @@ class ModuleChanProtect : public Module user->Shrink("cm_protect_"+std::string(channel->name)); } - virtual void OnRehash(const std::string ¶meter) + virtual void OnRehash(userrec* user, const std::string ¶meter) { /* Create a configreader class and read our flag, * in old versions this was heap-allocated and the @@ -351,6 +348,7 @@ class ModuleChanProtect : public Module DELETE(cf); cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf); cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf); + /* These wont fail, we already owned the mode characters before */ ServerInstance->AddMode(cp, 'a'); ServerInstance->AddMode(cf, 'q'); ServerInstance->WriteOpers("*** WARNING: +qa prefixes were enabled or disabled via a REHASH. Clients will probably need to reconnect to pick up this change."); @@ -374,10 +372,7 @@ class ModuleChanProtect : public Module // to make it clearer that +q has been given, send that one user the +q notice // so that their client's syncronization and their sanity are left intact. user->WriteServ("MODE %s +q %s",channel->name,user->nick); - if (user->Extend("cm_founder_"+std::string(channel->name),fakevalue)) - { - ServerInstance->Log(DEBUG,"Marked user "+std::string(user->nick)+" as founder for "+std::string(channel->name)); - } + user->Extend("cm_founder_"+std::string(channel->name),fakevalue); } } } @@ -387,8 +382,6 @@ class ModuleChanProtect : public Module // here we perform access checks, this is the important bit that actually stops kicking/deopping // etc of protected users. There are many types of access check, we're going to handle // a relatively small number of them relevent to our module using a switch statement. - - ServerInstance->Log(DEBUG,"chanprotect OnAccessCheck %d",access_type); // don't allow action if: // (A) Theyre founder (no matter what) // (B) Theyre protected, and you're not @@ -399,10 +392,7 @@ class ModuleChanProtect : public Module // firstly, if a ulined nick, or a server, is setting the mode, then allow them to set the mode // without any access checks, we're not worthy :p if ((ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server)) - { - ServerInstance->Log(DEBUG,"chanprotect OnAccessCheck returns ALLOW"); return ACR_ALLOW; - } std::string founder = "cm_founder_"+std::string(channel->name); std::string protect = "cm_protect_"+std::string(channel->name); @@ -411,17 +401,11 @@ class ModuleChanProtect : public Module { // a user has been deopped. Do we let them? hmmm... case AC_DEOP: - ServerInstance->Log(DEBUG,"OnAccessCheck AC_DEOP"); if (dest->GetExt(founder,dummyptr)) { - ServerInstance->Log(DEBUG,"Has %s",founder.c_str()); source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're a channel founder"); return ACR_DENY; } - else - { - ServerInstance->Log(DEBUG,"Doesnt have %s",founder.c_str()); - } if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr))) { source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're protected (+a)"); @@ -431,7 +415,6 @@ class ModuleChanProtect : public Module // a user is being kicked. do we chop off the end of the army boot? case AC_KICK: - ServerInstance->Log(DEBUG,"OnAccessCheck AC_KICK"); if (dest->GetExt(founder,dummyptr)) { source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're a channel founder"); @@ -474,7 +457,6 @@ class ModuleChanProtect : public Module } // we dont know what this access check is, or dont care. just carry on, nothing to see here. - ServerInstance->Log(DEBUG,"chanprotect OnAccessCheck returns DEFAULT"); return ACR_DEFAULT; }