]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_chanprotect.cpp
First phase of conversion to dynamic limits on all the lengths, configured via the...
[user/henk/code/inspircd.git] / src / modules / m_chanprotect.cpp
index 40cd4f39a0296069b505d49c8075f56a239e96b9..a79eda993eb6b50696676f4f670d476c870cbc38 100644 (file)
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * 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.
  *
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides channel modes +a and +q */
 
-const char* fakevalue = "on";
+#define PROTECT_VALUE 40000
+#define FOUNDER_VALUE 50000
 
-class ChanFounder : public ModeHandler
+/** Handles basic operation of +qa channel modes
+ */
+class FounderProtectBase
 {
-       Server* Srv;
+ private:
+       InspIRCd* MyInstance;
+       std::string extend;
+       std::string type;
+       int list;
+       int end;
+ protected:
+       bool& remove_own_privs;
+       bool& remove_other_privs;
  public:
-       ChanFounder(Server* s) : ModeHandler('q', 1, 1, true, MODETYPE_CHANNEL, false), Srv(s) { }
-
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       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)
        {
-               userrec* theuser = Srv->FindNick(parameter);
+       }
 
-               // cant find the user given as the parameter, eat the mode change.
-               if (!theuser)
+       ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
+       {
+               User* x = MyInstance->FindNick(parameter);
+               if (x)
                {
-                       parameter = "";
-                       return MODEACTION_DENY;
+                       if (!channel->HasUser(x))
+                       {
+                               return std::make_pair(false, parameter);
+                       }
+                       else
+                       {
+                               std::string item = extend+std::string(channel->name);
+                               if (x->GetExt(item))
+                               {
+                                       return std::make_pair(true, x->nick);
+                               }
+                               else
+                               {
+                                       return std::make_pair(false, parameter);
+                               }
+                       }
                }
+               return std::make_pair(false, parameter);
+       }
 
-               // given user isnt even on the channel, eat the mode change
-               if (!channel->HasUser(theuser))
+       void RemoveMode(Channel* channel, char mc, irc::modestacker* stack)
+       {
+               CUList* cl = channel->GetUsers();
+               std::string item = extend + std::string(channel->name);
+               std::vector<std::string> mode_junk;
+               mode_junk.push_back(channel->name);
+               irc::modestacker modestack(ServerInstance, false);
+               std::deque<std::string> stackresult;                            
+
+               for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
                {
-                       parameter = "";
-                       return MODEACTION_DENY;
+                       if (i->first->GetExt(item))
+                       {
+                               if (stack)
+                                       stack->Push(mc, i->first->nick);
+                               else
+                                       modestack.Push(mc, i->first->nick);
+                       }
                }
 
-                // source is a server, or ulined, we'll let them +-q the user.
-               if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!*source->server))
+               if (stack)
+                       return;
+
+               while (modestack.GetStackedLine(stackresult))
                {
-                       if (adding)
+                       for (size_t j = 0; j < stackresult.size(); j++)
                        {
-                               if (!theuser->GetExt("cm_founder_"+std::string(channel->name)))
-                               {
-                                       theuser->Extend("cm_founder_"+std::string(channel->name),fakevalue);
-                                       // Tidy the nickname (make case match etc)
-                                       parameter = theuser->nick;
-                                       return MODEACTION_ALLOW;
-                               }
+                               mode_junk.push_back(stackresult[j]);
                        }
-                       else
+                       MyInstance->SendMode(mode_junk, MyInstance->FakeClient);
+               }
+       }
+
+       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)
+               {
+                       if (i->first->GetExt(item))
                        {
-                               if (theuser->GetExt("cm_founder_"+std::string(channel->name)))
-                               {
-                                       theuser->Shrink("cm_founder_"+std::string(channel->name));
-                                       // 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 &parameter, Channel* channel)
+       {
+               User* theuser = MyInstance->FindNick(parameter);
+               if ((!theuser) || (!channel->HasUser(theuser)))
                {
-                       // whoops, someones being naughty!
-                       WriteServ(source->fd,"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)
        {
-               chanuserlist cl = Srv->GetUsers(channel);
-               for (unsigned int i = 0; i < cl.size(); i++)
+               std::string item = extend+std::string(c->name);
+               return (u1->GetExt(item) && u2->GetExt(item));
+       }
+
+       ModeAction HandleChange(User* source, User* theuser, bool adding, Channel* channel, std::string &parameter)
+       {
+               std::string item = extend+std::string(channel->name);
+
+               if (adding)
                {
-                       if (cl[i]->GetExt("cm_founder_"+std::string(channel->name)))
+                       if (!theuser->GetExt(item))
                        {
-                               WriteServ(user->fd,"386 %s %s %s",user->nick, channel->name,cl[i]->nick);
+                               theuser->Extend(item);
+                               parameter = theuser->nick;
+                               return MODEACTION_ALLOW;
                        }
                }
-               WriteServ(user->fd,"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
 {
-       Server* Srv;
  public:
-       ChanProtect(Server* s) : ModeHandler('a', 1, 1, true, MODETYPE_CHANNEL, false), Srv(s) { }
+       ChanFounder(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others)
+               : ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false, my_prefix, 0),
+                 FounderProtectBase(Instance, "cm_founder_", "founder", 386, 387, depriv_self, depriv_others) { }
+
+       unsigned int GetPrefixRank()
+       {
+               return FOUNDER_VALUE;
+       }
+
+       ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
+       {
+               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 &parameter, bool adding)
+       void RemoveMode(User* user, irc::modestacker* stack)
        {
-               userrec* theuser = Srv->FindNick(parameter);
+       }
+
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, 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 (!chan->HasUser(theuser))
+               if ((!adding) && FounderProtectBase::CanRemoveOthers(source, theuser, channel))
+               {
+                       return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
+               }
+                // 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)))
                {
-                       parameter = "";
+                       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),
+                 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 &parameter)
+       {
+               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 &parameter, bool adding, bool)
+       {
+               User* theuser = FounderProtectBase::FindAndVerify(parameter, channel);
+
+               if (!theuser)
+                       return MODEACTION_DENY;
+
+               std::string founder = "cm_founder_"+std::string(channel->name);
+
+               if ((!adding) && FounderProtectBase::CanRemoveOthers(source, theuser, channel))
+               {
+                       return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
+               }
                // source has +q, is a server, or ulined, we'll let them +-a the user.
-               if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!*source->server) || (source->GetExt("cm_founder_"+std::string(channel->name))))
+               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)))
                {
-                       if (adding)
-                       {
-                               if (!theuser->GetExt("cm_protect_"+std::string(channel->name)))
-                               {
-                                       theuser->Extend("cm_protect_"+std::string(channel->name),fakevalue);
-                                       // Tidy the nickname (make case match etc)
-                                       parameter = theuser->nick;
-                                       return MODEACTION_ALLOW;
-                               }
-                       }
-                       else
-                       {
-                               if (theuser->GetExt("cm_protect_"+std::string(channel->name)))
-                               {
-                                       theuser->Shrink("cm_protect_"+std::string(channel->name));
-                                       // 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!
-                       WriteServ(user->fd,"482 %s %s :You are not a channel founder",user->nick, chan->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)
        {
-               chanuserlist cl = Srv->GetUsers(channel);
-               for (unsigned int i = 0; i < cl.size(); i++)
-               {
-                       if (cl[i]->GetExt("cm_protect_"+std::string(channel->name)))
-                       {
-                               WriteServ(user->fd,"388 %s %s %s",user->nick, channel->name,cl[i]->nick);
-                       }
-               }
-               WriteServ(user->fd,"389 %s %s :End of channel protected user list",user->nick, channel->name);
+               FounderProtectBase::DisplayList(user, channel);
        }
 
 };
 
 class ModuleChanProtect : public Module
 {
-       Server *Srv;
+       
        bool FirstInGetsFounder;
-       ConfigReader *Conf;
+       char QPrefix;
+       char APrefix;
+       bool DeprivSelf;
+       bool DeprivOthers;
+       bool booting;
        ChanProtect* cp;
        ChanFounder* cf;
        
  public:
  
-       ModuleChanProtect(Server* Me) : Module::Module(Me), Srv(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 */
-               Conf = new ConfigReader;
 
-               cp = new ChanProtect(Me);
-               cf = new ChanFounder(Me);
-               
-               Srv->AddMode(cp, 'a');
-               Srv->AdDMode(cf, 'q');
-               
-               // read our config options (main config file)
-               FirstInGetsFounder = Conf->ReadFlag("options","noservices",0);
-       }
+               cp = new ChanProtect(ServerInstance, APrefix, DeprivSelf, DeprivOthers);
+               cf = new ChanFounder(ServerInstance, QPrefix, DeprivSelf, DeprivOthers);
 
-       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)
-       {
-               InsertMode(output,"qa",1);
+               if (!ServerInstance->Modes->AddMode(cp) || !ServerInstance->Modes->AddMode(cf))
+               {
+                       delete cp;
+                       delete cf;
+                       throw ModuleException("Could not add new modes!");
+               }
+
+               Implementation eventlist[] = { I_OnUserKick, I_OnUserPart, I_OnUserPreJoin, I_OnPostJoin, I_OnAccessCheck };
+               ServerInstance->Modules->Attach(eventlist, this, 5);
        }
 
-       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, const 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 &parameter)
+       void LoadSettings()
        {
-               // on a rehash we delete our classes for good measure and create them again.
-               DELETE(Conf);
-               Conf = new ConfigReader;
-               // re-read our config options on a rehash
-               FirstInGetsFounder = Conf->ReadFlag("options","noservices",0);
+               /* 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);
+
+               std::string qpre = Conf.ReadValue("options", "qprefix", 0);
+               QPrefix = qpre.empty() ? 0 : qpre[0];
+
+               std::string apre = Conf.ReadValue("options", "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("options","deprotectself",0);
+               DeprivOthers = Conf.ReadFlag("options","deprotectothers",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 (Srv->CountUsers(channel) == 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.
-                               WriteServ(user->fd,"MODE %s +q %s",channel->name,user->nick);
-                               if (user->Extend("cm_founder_"+std::string(channel->name),fakevalue))
-                               {
-                                       Srv->Log(DEBUG,"Marked user "+std::string(user->nick)+" as founder for "+std::string(channel->name));
-                               }
-                       }
-               }
+
+               if (FirstInGetsFounder && !chan)
+                       privs = QPrefix + "@";
+               
+               return 0;
+       }
+       
+       virtual void OnPostJoin(User *user, Channel *channel)
+       {
+               // This *must* be in PostJoin, not UserJoin - the former will make it appear to happen
+               // before the client is in the channel
+               
+               // This notice was here originally because it was all done prior to the creation of
+               // privs in OnUserPreJoin. I've left it because it might still be wanted, but i'm
+               // not sure it really should be here - ops don't get shown, obviously, and the prefix
+               // will appear in the names list for the user.. remove if desired -Special
+
+               if (FirstInGetsFounder && channel->GetUserCounter() == 1)
+                       user->WriteServ("MODE %s +q %s", channel->name.c_str(), user->nick.c_str());
        }
        
-       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.
-       
                // don't allow action if:
                // (A) Theyre founder (no matter what)
                // (B) Theyre protected, and you're not
@@ -266,65 +405,66 @@ 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 ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!strcmp(source->server,"")))
-               {
+               if ((ServerInstance->ULine(source->nick.c_str())) || (ServerInstance->ULine(source->server)) || (!*source->server))
                        return ACR_ALLOW;
-               }
+
+               std::string founder("cm_founder_"+channel->name);
+               std::string protect("cm_protect_"+channel->name);
 
                switch (access_type)
                {
                        // a user has been deopped. Do we let them? hmmm...
                        case AC_DEOP:
-                               if (dest->GetExt("cm_founder_"+std::string(channel->name)))
+                               if (dest->GetExt(founder))
                                {
-                                       Srv->SendServ(source->fd,"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;
                                }
-                               if ((dest->GetExt("cm_protect_"+std::string(channel->name))) && (!source->GetExt("cm_protect_"+std::string(channel->name))))
+                               if ((dest->GetExt(protect)) && (!source->GetExt(protect)))
                                {
-                                       Srv->SendServ(source->fd,"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:
-                               if (dest->GetExt("cm_founder_"+std::string(channel->name)))
+                               if (dest->GetExt(founder))
                                {
-                                       Srv->SendServ(source->fd,"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("cm_protect_"+std::string(channel->name))) && (!source->GetExt("cm_protect_"+std::string(channel->name))))
+                               if ((dest->GetExt(protect)) && (!source->GetExt(protect)))
                                {
-                                       Srv->SendServ(source->fd,"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("cm_founder_"+std::string(channel->name)))
+                               if (dest->GetExt(founder))
                                {
-                                       Srv->SendServ(source->fd,"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("cm_protect_"+std::string(channel->name))) && (!source->GetExt("cm_protect_"+std::string(channel->name))))
+                               if ((dest->GetExt(protect)) && (!source->GetExt(protect)))
                                {
-                                       Srv->SendServ(source->fd,"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("cm_founder_"+std::string(channel->name)))
+                               if (dest->GetExt(founder))
                                {
-                                       Srv->SendServ(source->fd,"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("cm_protect_"+std::string(channel->name))) && (!source->GetExt("cm_protect_"+std::string(channel->name))))
+                               if ((dest->GetExt(protect)) && (!source->GetExt(protect)))
                                {
-                                       Srv->SendServ(source->fd,"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;
@@ -336,59 +476,16 @@ class ModuleChanProtect : public Module
        
        virtual ~ModuleChanProtect()
        {
-               DELETE(Conf);
-               DELETE(cp);
-               DELETE(cf);
+               ServerInstance->Modes->DelMode(cp);
+               ServerInstance->Modes->DelMode(cf);
+               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.
-               chanuserlist cl = Srv->GetUsers(chan);
-               string_list commands;
-               for (unsigned int i = 0; i < cl.size(); i++)
-               {
-                       if (cl[i]->GetExt("cm_founder_"+std::string(chan->name)))
-                       {
-                               proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+q "+std::string(cl[i]->nick));
-                       }
-                       if (cl[i]->GetExt("cm_protect_"+std::string(chan->name)))
-                       {
-                               proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+a "+std::string(cl[i]->nick));
-                       }
-               }
-       }
-
-};
-
-
-class ModuleChanProtectFactory : public ModuleFactory
-{
- public:
-       ModuleChanProtectFactory()
-       {
-       }
-       
-       ~ModuleChanProtectFactory()
-       {
+               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
-       
-       virtual Module * CreateModule(Server* Me)
-       {
-               return new ModuleChanProtect(Me);
-       }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleChanProtectFactory;
-}
+MODULE_INIT(ModuleChanProtect)