X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanprotect.cpp;h=e24e64a3e90451756dce75f8447c46b7944580ff;hb=8cebe2878f3878afce6f643d93668155cb26801d;hp=68a4afb9f2cb5fdfe6ab4c1a1b7cf3b5d1a4c0e6;hpb=7775a195d9c417e52eaaf912ec51d62bf0fd9a54;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp index 68a4afb9f..e24e64a3e 100644 --- a/src/modules/m_chanprotect.cpp +++ b/src/modules/m_chanprotect.cpp @@ -2,40 +2,45 @@ * | 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-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits + * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" #include "inspircd.h" -#include "commands.h" +#include "m_override.h" /* $ModDesc: Provides channel modes +a and +q */ +#define PROTECT_VALUE 40000 +#define FOUNDER_VALUE 50000 - -const char* fakevalue = "on"; - -class ChanFounder : public ModeHandler +/** Handles basic operation of +qa channel modes + */ +class FounderProtectBase { - char* dummyptr; + private: + InspIRCd* MyInstance; + std::string extend; + std::string type; + int list; + int end; + protected: + bool& remove_own_privs; + bool& remove_other_privs; public: - ChanFounder(InspIRCd* Instance) : ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false) { } + FounderProtectBase(InspIRCd* Instance, const std::string &ext, const std::string &mtype, int l, int e, bool &remove_own, bool &remove_others) : + MyInstance(Instance), extend(ext), type(mtype), list(l), end(e), remove_own_privs(remove_own), remove_other_privs(remove_others) + { + } - ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { - userrec* x = ServerInstance->FindNick(parameter); + User* x = MyInstance->FindNick(parameter); if (x) { if (!channel->HasUser(x)) @@ -44,8 +49,8 @@ class ChanFounder : public ModeHandler } else { - std::string founder = "cm_founder_"+std::string(channel->name); - if (x->GetExt(founder,dummyptr)) + std::string item = extend+std::string(channel->name); + if (x->GetExt(item)) { return std::make_pair(true, x->nick); } @@ -58,425 +63,436 @@ class ChanFounder : public ModeHandler return std::make_pair(false, parameter); } - - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + void RemoveMode(Channel* channel, char mc, irc::modestacker* stack) { - userrec* theuser = ServerInstance->FindNick(parameter); - - ServerInstance->Log(DEBUG,"ChanFounder::OnModeChange"); + CUList* cl = channel->GetUsers(); + std::string item = extend + std::string(channel->name); + std::vector mode_junk; + mode_junk.push_back(channel->name); + irc::modestacker modestack(MyInstance, false); + std::deque stackresult; - // cant find the user given as the parameter, eat the mode change. - if (!theuser) + for (CUList::iterator i = cl->begin(); i != cl->end(); i++) { - ServerInstance->Log(DEBUG,"No such user in ChanFounder"); - parameter = ""; - return MODEACTION_DENY; + if (i->first->GetExt(item)) + { + if (stack) + stack->Push(mc, i->first->nick); + else + modestack.Push(mc, i->first->nick); + } } - // given user isnt even on the channel, eat the mode change - if (!channel->HasUser(theuser)) + if (stack) + return; + + while (modestack.GetStackedLine(stackresult)) { - ServerInstance->Log(DEBUG,"Channel doesn't have user in ChanFounder"); - parameter = ""; - return MODEACTION_DENY; + mode_junk.insert(mode_junk.end(), stackresult.begin(), stackresult.end()); + MyInstance->SendMode(mode_junk, MyInstance->FakeClient); + mode_junk.erase(mode_junk.begin() + 1, mode_junk.end()); } + } - std::string protect = "cm_protect_"+std::string(channel->name); - std::string founder = "cm_founder_"+std::string(channel->name); - - // source is a server, or ulined, we'll let them +-q the user. - if ((ServerInstance->is_uline(source->nick)) || (ServerInstance->is_uline(source->server)) || (!*source->server) || (!IS_LOCAL(source))) + void DisplayList(User* user, Channel* channel) + { + CUList* cl = channel->GetUsers(); + std::string item = extend+std::string(channel->name); + for (CUList::reverse_iterator i = cl->rbegin(); i != cl->rend(); ++i) { - ServerInstance->Log(DEBUG,"Allowing remote mode change in ChanFounder"); - if (adding) - { - if (!theuser->GetExt(founder,dummyptr)) - { - ServerInstance->Log(DEBUG,"Does not have the ext item in ChanFounder"); - if (!theuser->Extend(founder,fakevalue)) - ServerInstance->Log(DEBUG,"COULD NOT EXTEND!!!"); - // Tidy the nickname (make case match etc) - parameter = theuser->nick; - if (theuser->GetExt(founder, dummyptr)) - ServerInstance->Log(DEBUG,"Extended!"); - else - ServerInstance->Log(DEBUG,"Not extended :("); - return MODEACTION_ALLOW; - } - } - else + if (i->first->GetExt(item)) { - if (theuser->GetExt(founder, dummyptr)) - { - theuser->Shrink(founder); - // Tidy the nickname (make case match etc) - parameter = theuser->nick; - return MODEACTION_ALLOW; - } + user->WriteServ("%d %s %s %s", list, user->nick.c_str(), channel->name.c_str(), i->first->nick.c_str()); } - return MODEACTION_DENY; } - else + user->WriteServ("%d %s %s :End of channel %s list", end, user->nick.c_str(), channel->name.c_str(), type.c_str()); + } + + User* FindAndVerify(std::string ¶meter, Channel* channel) + { + User* theuser = MyInstance->FindNick(parameter); + if ((!theuser) || (!channel->HasUser(theuser))) { - // whoops, someones being naughty! - source->WriteServ("468 %s %s :Only servers may set channel mode +q",source->nick, channel->name); - parameter = ""; - return MODEACTION_DENY; + parameter.clear(); + return NULL; } + return theuser; } - void DisplayList(userrec* user, chanrec* channel) + bool CanRemoveOthers(User* u1, User* u2, Channel* c) { - CUList* cl = channel->GetUsers(); - std::string founder = "cm_founder_"+std::string(channel->name); - for (CUList::iterator i = cl->begin(); i != cl->end(); i++) + std::string item = extend+std::string(c->name); + return (remove_other_privs && u1->GetExt(item) && u2->GetExt(item)); + } + + ModeAction HandleChange(User* source, User* theuser, bool adding, Channel* channel, std::string ¶meter) + { + std::string item = extend+std::string(channel->name); + + if (adding) { - if (i->second->GetExt(founder, dummyptr)) + if (!theuser->GetExt(item)) { - user->WriteServ("386 %s %s %s",user->nick, channel->name,i->second->nick); + theuser->Extend(item); + parameter = theuser->nick; + return MODEACTION_ALLOW; } } - user->WriteServ("387 %s %s :End of channel founder list",user->nick, channel->name); + else + { + if (theuser->GetExt(item)) + { + theuser->Shrink(item); + parameter = theuser->nick; + return MODEACTION_ALLOW; + } + } + return MODEACTION_DENY; } - }; -class ChanProtect : public ModeHandler +/** Abstraction of FounderProtectBase for channel mode +q + */ +class ChanFounder : public ModeHandler, public FounderProtectBase { - char* dummyptr; public: - ChanProtect(InspIRCd* Instance) : ModeHandler(Instance, 'a', 1, 1, true, MODETYPE_CHANNEL, false) { } + ChanFounder(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others) + : ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false, my_prefix, 0, TR_NICK), + FounderProtectBase(Instance, "cm_founder_", "founder", 386, 387, depriv_self, depriv_others) { } - ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + unsigned int GetPrefixRank() { - userrec* x = ServerInstance->FindNick(parameter); - if (x) - { - if (!channel->HasUser(x)) - { - return std::make_pair(false, parameter); - } - else - { - std::string founder = "cm_protect_"+std::string(channel->name); - if (x->GetExt(founder,dummyptr)) - { - return std::make_pair(true, x->nick); - } - else - { - return std::make_pair(false, parameter); - } - } - } - return std::make_pair(false, parameter); + return FOUNDER_VALUE; + } + + ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) + { + return FounderProtectBase::ModeSet(source, dest, channel, parameter); + } + + void RemoveMode(Channel* channel, irc::modestacker* stack) + { + FounderProtectBase::RemoveMode(channel, this->GetModeChar(), stack); } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + void RemoveMode(User* user, irc::modestacker* stack) { - userrec* theuser = ServerInstance->FindNick(parameter); + } + + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) + { + User* theuser = FounderProtectBase::FindAndVerify(parameter, channel); - // cant find the user given as the parameter, eat the mode change. if (!theuser) { - parameter = ""; return MODEACTION_DENY; } - // given user isnt even on the channel, eat the mode change - if (!channel->HasUser(theuser)) + if ((!adding) && FounderProtectBase::CanRemoveOthers(source, theuser, channel)) { - parameter = ""; + return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); + } + + char isoverride=0; + Module *Override = ServerInstance->Modules->FindFeature("Override"); + if (Override) + { + OVRrequest ovr(NULL,Override,source,"OTHERMODE"); + const char * tmp = ovr.Send(); + isoverride = tmp[0]; + } + // source is a server, or ulined, we'll let them +-q the user. + if (source == ServerInstance->FakeClient || + ((source == theuser) && (!adding) && (FounderProtectBase::remove_own_privs)) || + (ServerInstance->ULine(source->nick.c_str())) || + (ServerInstance->ULine(source->server)) || + (!*source->server) || + (!IS_LOCAL(source)) || + isoverride) + { + return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); + } + else + { + // whoops, someones being naughty! + source->WriteNumeric(468, "%s %s :Only servers may set channel mode +q", source->nick.c_str(), channel->name.c_str()); + parameter.clear(); return MODEACTION_DENY; } + } + + void DisplayList(User* user, Channel* channel) + { + FounderProtectBase::DisplayList(user,channel); + } +}; + +/** Abstraction of FounderProtectBase for channel mode +a + */ +class ChanProtect : public ModeHandler, public FounderProtectBase +{ + public: + ChanProtect(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others) + : ModeHandler(Instance, 'a', 1, 1, true, MODETYPE_CHANNEL, false, my_prefix, 0, TR_NICK), + FounderProtectBase(Instance,"cm_protect_","protected user", 388, 389, depriv_self, depriv_others) { } + + unsigned int GetPrefixRank() + { + return PROTECT_VALUE; + } + + ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) + { + return FounderProtectBase::ModeSet(source, dest, channel, parameter); + } + + void RemoveMode(Channel* channel, irc::modestacker* stack) + { + FounderProtectBase::RemoveMode(channel, this->GetModeChar(), stack); + } + + void RemoveMode(User* user, irc::modestacker* stack) + { + } + + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) + { + User* theuser = FounderProtectBase::FindAndVerify(parameter, channel); + + if (!theuser) + return MODEACTION_DENY; - std::string protect = "cm_protect_"+std::string(channel->name); std::string founder = "cm_founder_"+std::string(channel->name); + if ((!adding) && FounderProtectBase::CanRemoveOthers(source, theuser, channel)) + { + return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); + } + + char isoverride=0; + Module *Override = ServerInstance->Modules->FindFeature("Override"); + if (Override) + { + OVRrequest ovr(NULL,Override,source,"OTHERMODE"); + const char * tmp = ovr.Send(); + isoverride = tmp[0]; + } // source has +q, is a server, or ulined, we'll let them +-a the user. - if ((ServerInstance->is_uline(source->nick)) || (ServerInstance->is_uline(source->server)) || (!*source->server) || (source->GetExt(founder,dummyptr)) || (!IS_LOCAL(source))) + if (source == ServerInstance->FakeClient || + ((source == theuser) && (!adding) && (FounderProtectBase::remove_own_privs)) || + (ServerInstance->ULine(source->nick.c_str())) || + (ServerInstance->ULine(source->server)) || + (!*source->server) || + (source->GetExt(founder)) || + (!IS_LOCAL(source)) || + isoverride + ) { - if (adding) - { - if (!theuser->GetExt(protect,dummyptr)) - { - theuser->Extend(protect,fakevalue); - // Tidy the nickname (make case match etc) - parameter = theuser->nick; - return MODEACTION_ALLOW; - } - } - else - { - if (theuser->GetExt(protect,dummyptr)) - { - theuser->Shrink(protect); - // Tidy the nickname (make case match etc) - parameter = theuser->nick; - return MODEACTION_ALLOW; - } - } - return MODEACTION_DENY; + return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); } else { // bzzzt, wrong answer! - source->WriteServ("482 %s %s :You are not a channel founder",source->nick, channel->name); + source->WriteNumeric(482, "%s %s :You are not a channel founder", source->nick.c_str(), channel->name.c_str()); return MODEACTION_DENY; } } - virtual void DisplayList(userrec* user, chanrec* channel) + virtual void DisplayList(User* user, Channel* channel) { - CUList* cl = channel->GetUsers(); - std::string protect = "cm_protect_"+std::string(channel->name); - for (CUList::iterator i = cl->begin(); i != cl->end(); i++) - { - if (i->second->GetExt(protect,dummyptr)) - { - user->WriteServ("388 %s %s %s",user->nick, channel->name,i->second->nick); - } - } - user->WriteServ("389 %s %s :End of channel protected user list",user->nick, channel->name); + FounderProtectBase::DisplayList(user, channel); } }; class ModuleChanProtect : public Module { - + bool FirstInGetsFounder; + char QPrefix; + char APrefix; + bool DeprivSelf; + bool DeprivOthers; + bool booting; ChanProtect* cp; ChanFounder* cf; - char* dummyptr; - + public: - - ModuleChanProtect(InspIRCd* Me) : Module::Module(Me) - { + + ModuleChanProtect(InspIRCd* Me) + : Module(Me), FirstInGetsFounder(false), QPrefix(0), APrefix(0), DeprivSelf(false), DeprivOthers(false), booting(true), cp(NULL), cf(NULL) + { + /* Load config stuff */ + LoadSettings(); + booting = false; + /* Initialise module variables */ - cp = new ChanProtect(ServerInstance); - cf = new ChanFounder(ServerInstance); + cp = new ChanProtect(ServerInstance, APrefix, DeprivSelf, DeprivOthers); + cf = new ChanFounder(ServerInstance, QPrefix, DeprivSelf, DeprivOthers); - ServerInstance->AddMode(cp, 'a'); - ServerInstance->AddMode(cf, 'q'); - - /* Load config stuff */ - OnRehash(""); - } + if (!ServerInstance->Modes->AddMode(cp) || !ServerInstance->Modes->AddMode(cf)) + { + delete cp; + delete cf; + throw ModuleException("Could not add new modes!"); + } - void Implements(char* List) - { - List[I_On005Numeric] = List[I_OnUserKick] = List[I_OnUserPart] = List[I_OnRehash] = List[I_OnUserJoin] = List[I_OnAccessCheck] = List[I_OnSyncChannel] = 1; - } - - virtual void On005Numeric(std::string &output) - { - ServerInstance->ModeGrok->InsertMode(output,"qa",1); + Implementation eventlist[] = { I_OnUserKick, I_OnUserPart, I_OnUserPreJoin, I_OnAccessCheck }; + ServerInstance->Modules->Attach(eventlist, this, 4); } - virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) + virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) { // FIX: when someone gets kicked from a channel we must remove their Extensibles! user->Shrink("cm_founder_"+std::string(chan->name)); user->Shrink("cm_protect_"+std::string(chan->name)); } - virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partreason) + virtual void OnUserPart(User* user, Channel* channel, std::string &partreason, bool &silent) { // FIX: when someone parts a channel we must remove their Extensibles! user->Shrink("cm_founder_"+std::string(channel->name)); user->Shrink("cm_protect_"+std::string(channel->name)); } - virtual void OnRehash(const std::string ¶meter) + void LoadSettings() { - /* Create a configreader class and read our flag, - * in old versions this was heap-allocated and the - * object was kept between rehashes...now we just - * stack-allocate it locally. - */ ConfigReader Conf(ServerInstance); - - FirstInGetsFounder = Conf.ReadFlag("options","noservices",0); + + FirstInGetsFounder = Conf.ReadFlag("chanprotect", "noservices", 0); + + std::string qpre = Conf.ReadValue("chanprotect", "qprefix", 0); + QPrefix = qpre.empty() ? 0 : qpre[0]; + + std::string apre = Conf.ReadValue("chanprotect", "aprefix", 0); + APrefix = apre.empty() ? 0 : apre[0]; + + if ((APrefix && QPrefix) && APrefix == QPrefix) + throw ModuleException("What the smeg, why are both your +q and +a prefixes the same character?"); + + if (cp && ServerInstance->Modes->FindPrefix(APrefix) == cp) + throw ModuleException("Looks like the +a prefix you picked for m_chanprotect is already in use. Pick another."); + + if (cf && ServerInstance->Modes->FindPrefix(QPrefix) == cf) + throw ModuleException("Looks like the +q prefix you picked for m_chanprotect is already in use. Pick another."); + + DeprivSelf = Conf.ReadFlag("chanprotect","deprotectself", "yes", 0); + DeprivOthers = Conf.ReadFlag("chanprotect","deprotectothers", "yes", 0); } - - virtual void OnUserJoin(userrec* user, chanrec* channel) + + virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven) { // if the user is the first user into the channel, mark them as the founder, but only if // the config option for it is set - if (FirstInGetsFounder) - { - if (channel->GetUserCounter() == 1) - { - // we're using Extensible::Extend to add data into user objects. - // this way is best as it adds data thats accessible to other modules - // (so long as you document your code properly) without breaking anything - // because its encapsulated neatly in a map. - - // Change requested by katsklaw... when the first in is set to get founder, - // 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)); - } - } - } + + if (FirstInGetsFounder && !chan) + privs = std::string(1, QPrefix) + "@"; + + return 0; } - - virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type) + + virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type) { // 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 + // (B) Theyre protected, unless you're founder or are protected and DeprivOthers is enabled // always allow the action if: // (A) The source is ulined - - + // 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->is_uline(source->nick)) || (ServerInstance->is_uline(source->server)) || (!*source->server)) - { + if ((ServerInstance->ULine(source->nick.c_str())) || (ServerInstance->ULine(source->server)) || (!*source->server)) return ACR_ALLOW; - } - std::string founder = "cm_founder_"+std::string(channel->name); - std::string protect = "cm_protect_"+std::string(channel->name); + std::string founder("cm_founder_"+channel->name); + std::string protect("cm_protect_"+channel->name); + + // Can do anything to yourself if deprotectself is enabled. + if (DeprivSelf && source == dest) + return ACR_DEFAULT; + + bool candepriv_founder = (DeprivOthers && source->GetExt(founder)); + bool candepriv_protected = (source->GetExt(founder) || (DeprivOthers && source->GetExt(protect))); // Can the source remove +a? switch (access_type) { // a user has been deopped. Do we let them? hmmm... case AC_DEOP: - ServerInstance->Log(DEBUG,"OnAccessCheck AC_DEOP"); - if (dest->GetExt(founder,dummyptr)) + if (dest->GetExt(founder) && !candepriv_founder) { - 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"); + source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't deop "+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))) + if ((dest->GetExt(protect)) && !candepriv_protected) { - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're protected (+a)"); + source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't deop "+dest->nick+" as they're protected (+a)"); return ACR_DENY; } break; // 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)) + if (dest->GetExt(founder) && !candepriv_founder) { - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're a channel founder"); + source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't kick "+dest->nick+" as they're a channel founder"); return ACR_DENY; } - if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr))) + if ((dest->GetExt(protect)) && !candepriv_protected) { - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're protected (+a)"); + source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't kick "+dest->nick+" as they're protected (+a)"); return ACR_DENY; } break; // a user is being dehalfopped. Yes, we do disallow -h of a +ha user case AC_DEHALFOP: - if (dest->GetExt(founder,dummyptr)) + if (dest->GetExt(founder) && !candepriv_founder) { - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're a channel founder"); + source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't de-halfop "+dest->nick+" as they're a channel founder"); return ACR_DENY; } - if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr))) + if ((dest->GetExt(protect)) && !candepriv_protected) { - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're protected (+a)"); + source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't de-halfop "+dest->nick+" as they're protected (+a)"); return ACR_DENY; } break; // same with devoice. case AC_DEVOICE: - if (dest->GetExt(founder,dummyptr)) + if (dest->GetExt(founder) && !candepriv_founder) { - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're a channel founder"); + source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't devoice "+dest->nick+" as they're a channel founder"); return ACR_DENY; } - if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr))) + if ((dest->GetExt(protect)) && !candepriv_protected) { - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're protected (+a)"); + source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't devoice "+dest->nick+" as they're protected (+a)"); return ACR_DENY; } break; } - + // we dont know what this access check is, or dont care. just carry on, nothing to see here. return ACR_DEFAULT; } - + virtual ~ModuleChanProtect() { - DELETE(cp); - DELETE(cf); - } - - virtual Version GetVersion() - { - return Version(1,0,0,0,VF_STATIC|VF_VENDOR); - } - - virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque) - { - // this is called when the server is linking into a net and wants to sync channel data. - // we should send our mode changes for the channel here to ensure that other servers - // know whos +q/+a on the channel. - CUList* cl = chan->GetUsers(); - string_list commands; - std::string founder = "cm_founder_"+std::string(chan->name); - std::string protect = "cm_protect_"+std::string(chan->name); - for (CUList::iterator i = cl->begin(); i != cl->end(); i++) - { - if (i->second->GetExt(founder,dummyptr)) - { - proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+q "+std::string(i->second->nick)); - } - if (i->second->GetExt(protect,dummyptr)) - { - proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+a "+std::string(i->second->nick)); - } - } + ServerInstance->Modes->DelMode(cp); + ServerInstance->Modes->DelMode(cf); + delete cp; + delete cf; } -}; - - -class ModuleChanProtectFactory : public ModuleFactory -{ - public: - ModuleChanProtectFactory() - { - } - - ~ModuleChanProtectFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) + virtual Version GetVersion() { - return new ModuleChanProtect(Me); + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleChanProtectFactory; -} +MODULE_INIT(ModuleChanProtect)