]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_chanprotect.cpp
Add extra /map info (connection uptime, and lag time) to /MAP for opers. Adds feature...
[user/henk/code/inspircd.git] / src / modules / m_chanprotect.cpp
index 8cf91d45cda6e1fcd5c527e27a480bb1633ba1a9..a1d58018097021cf1d60239e2703cb81351aa054 100644 (file)
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * 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 <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides channel modes +a and +q */
+/* $ModDep: ../../include/u_listmode.h */
+
+#define PROTECT_VALUE 40000
+#define FOUNDER_VALUE 50000
+
+const char* fakevalue = "on";
+
+/* When this is set to true, no restrictions apply to setting or
+ * removal of +qa. This is used while unloading so that the server
+ * can freely clear all of its users of the modes.
+ */
+bool unload_kludge = false;
+
+/** Handles basic operation of +qa channel modes
+ */
+class FounderProtectBase
+{
+ private:
+       InspIRCd* MyInstance;
+       std::string extend;
+       std::string type;
+       int list;
+       int end;
+       char* dummyptr;
+ protected:
+       bool& remove_own_privs;
+ public:
+       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)
+       {
+       }
+
+       ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+       {
+               userrec* x = MyInstance->FindNick(parameter);
+               if (x)
+               {
+                       if (!channel->HasUser(x))
+                       {
+                               return std::make_pair(false, parameter);
+                       }
+                       else
+                       {
+                               std::string item = extend+std::string(channel->name);
+                               if (x->GetExt(item,dummyptr))
+                               {
+                                       return std::make_pair(true, x->nick);
+                               }
+                               else
+                               {
+                                       return std::make_pair(false, parameter);
+                               }
+                       }
+               }
+               return std::make_pair(false, parameter);
+       }
+
+       void RemoveMode(chanrec* channel, char mc)
+       {
+               unload_kludge = true;
+               CUList* cl = channel->GetUsers();
+               std::string item = extend + std::string(channel->name);
+               const char* mode_junk[MAXMODES+1];
+               userrec* n = new userrec(MyInstance);
+               n->SetFd(FD_MAGIC_NUMBER);
+               mode_junk[0] = channel->name;
+               irc::modestacker modestack(false);
+               std::deque<std::string> stackresult;                            
+               for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
+               {
+                       if (i->second->GetExt(item, dummyptr))
+                       {
+                               modestack.Push(mc, i->second->nick);
+                       }
+               }
+
+               while (modestack.GetStackedLine(stackresult))
+               {
+                       for (size_t j = 0; j < stackresult.size(); j++)
+                       {
+                               mode_junk[j+1] = stackresult[j].c_str();
+                       }
+                       MyInstance->SendMode(mode_junk, stackresult.size() + 1, n);
+               }
+               
+               delete n;
+               unload_kludge = false;
+       }
+
+        void DisplayList(userrec* user, chanrec* channel)
+       {
+               CUList* cl = channel->GetUsers();
+               std::string item = extend+std::string(channel->name);
+               for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
+               {
+                       if (i->second->GetExt(item, dummyptr))
+                       {
+                               user->WriteServ("%d %s %s %s", list, user->nick, channel->name,i->second->nick);
+                       }
+               }
+               user->WriteServ("%d %s %s :End of channel %s list", end, user->nick, channel->name, type.c_str());
+       }
 
-char fakevalue[] = "on";
+       userrec* FindAndVerify(std::string &parameter, chanrec* channel)
+       {
+               userrec* theuser = MyInstance->FindNick(parameter);
+               if ((!theuser) || (!channel->HasUser(theuser)))
+               {
+                       parameter = "";
+                       return NULL;
+               }
+               return theuser;
+       }
+
+       ModeAction HandleChange(userrec* source, userrec* theuser, bool adding, chanrec* channel, std::string &parameter)
+       {
+               std::string item = extend+std::string(channel->name);
+
+               if (adding)
+               {
+                       if (!theuser->GetExt(item, dummyptr))
+                       {
+                               theuser->Extend(item, fakevalue);
+                               parameter = theuser->nick;
+                               return MODEACTION_ALLOW;
+                       }
+               }
+               else
+               {
+                       if (theuser->GetExt(item, dummyptr))
+                       {
+                               theuser->Shrink(item);
+                               parameter = theuser->nick;
+                               return MODEACTION_ALLOW;
+                       }
+               }
+               return MODEACTION_DENY;
+       }
+};
+
+/** Abstraction of FounderProtectBase for channel mode +q
+ */
+class ChanFounder : public ModeHandler, public FounderProtectBase
+{
+       char* dummyptr;
+ public:
+       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) { }
+
+       unsigned int GetPrefixRank()
+       {
+               return FOUNDER_VALUE;
+       }
+
+       ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+       {
+               return FounderProtectBase::ModeSet(source, dest, channel, parameter);
+       }
+
+       void RemoveMode(chanrec* channel)
+       {
+               FounderProtectBase::RemoveMode(channel, this->GetModeChar());
+       }
+
+       void RemoveMode(userrec* user)
+       {
+       }
+
+       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       {
+               userrec* theuser = FounderProtectBase::FindAndVerify(parameter, channel);
+
+               if (!theuser)
+               {
+                       return MODEACTION_DENY;
+               }
+
+                // source is a server, or ulined, we'll let them +-q the user.
+               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);
+               }
+               else
+               {
+                       // whoops, someones being naughty!
+                       source->WriteServ("468 %s %s :Only servers may set channel mode +q",source->nick, channel->name);
+                       parameter = "";
+                       return MODEACTION_DENY;
+               }
+       }
+
+       void DisplayList(userrec* user, chanrec* channel)
+       {
+               FounderProtectBase::DisplayList(user,channel);
+       }
+};
+
+/** Abstraction of FounderProtectBase for channel mode +a
+ */
+class ChanProtect : public ModeHandler, public FounderProtectBase
+{
+       char* dummyptr;
+ public:
+       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) { }
+
+       unsigned int GetPrefixRank()
+       {
+               return PROTECT_VALUE;
+       }
+
+       ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+       {
+               return FounderProtectBase::ModeSet(source, dest, channel, parameter);
+       }
+
+       void RemoveMode(chanrec* channel)
+       {
+               FounderProtectBase::RemoveMode(channel, this->GetModeChar());
+       }
+
+       void RemoveMode(userrec* user)
+       {
+       }
+
+       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       {
+               userrec* theuser = FounderProtectBase::FindAndVerify(parameter, channel);
+
+               if (!theuser)
+                       return MODEACTION_DENY;
+
+               std::string founder = "cm_founder_"+std::string(channel->name);
+
+               // source has +q, is a server, or ulined, we'll let them +-a the user.
+               if ((unload_kludge) || ((source == theuser) && (!adding) && (FounderProtectBase::remove_own_privs)) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server) || (source->GetExt(founder,dummyptr)) || (!IS_LOCAL(source)))
+               {
+                       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);
+                       return MODEACTION_DENY;
+               }
+       }
+
+       virtual void DisplayList(userrec* user, chanrec* channel)
+       {
+               FounderProtectBase::DisplayList(user, channel);
+       }
+
+};
 
 class ModuleChanProtect : public Module
 {
-       Server *Srv;
+       
        bool FirstInGetsFounder;
-       ConfigReader *Conf;
+       bool QAPrefixes;
+       bool DeprivSelf;
+       bool booting;
+       ChanProtect* cp;
+       ChanFounder* cf;
+       char* dummyptr;
        
  public:
  
-       ModuleChanProtect()
+       ModuleChanProtect(InspIRCd* Me)
+               : Module::Module(Me), FirstInGetsFounder(false), QAPrefixes(false), DeprivSelf(false), booting(true)
+       {       
+               /* Load config stuff */
+               OnRehash(NULL,"");
+               booting = false;
+
+               /* Initialise module variables */
+
+               cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf);
+               cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf);
+
+               if (!ServerInstance->AddMode(cp, 'a') || !ServerInstance->AddMode(cf, 'q'))
+                       throw ModuleException("Could not add new modes!");
+       }
+
+       void Implements(char* List)
        {
-       
-               // here we initialise our module. Use new to create new instances of the required
-               // classes.
-               
-               Srv = new Server;
-               Conf = new ConfigReader;
-               
-               // set up our modes. We're using listmodes and not normal extmodes here.
-               // listmodes only need one parameter as everything else is assumed by the
-               // nature of the mode thats being created.
-               Srv->AddExtendedListMode('a');
-               Srv->AddExtendedListMode('q');
-               
-               // read our config options (main config file)
-               FirstInGetsFounder = Conf->ReadFlag("options","noservices",0);
+               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)
-        {
-                std::stringstream line(output);
-                std::string temp1, temp2;
-                while (!line.eof())
-                {
-                        line >> temp1;
-                        if (temp1.substr(0,10) == "CHANMODES=")
-                        {
-                                // append the chanmode to the end
-                                temp1 = temp1.substr(10,temp1.length());
-                                temp1 = "CHANMODES=qa" + temp1;
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-               if (temp2.length())
-                       output = temp2.substr(0,temp2.length()-1);
-        }
-
-       virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, std::string reason)
+
+       virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason)
        {
                // 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)
+       virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partreason)
        {
                // 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()
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
-               // 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);
+
+               bool old_qa = QAPrefixes;
+
+               FirstInGetsFounder = Conf.ReadFlag("options","noservices",0);
+               QAPrefixes = Conf.ReadFlag("options","qaprefixes",0);
+               DeprivSelf = Conf.ReadFlag("options","deprotectself",0);
+
+               /* Did the user change the QA prefixes on the fly?
+                * If so, remove all instances of the mode, and reinit
+                * the module with prefixes enabled.
+                */
+               if ((old_qa != QAPrefixes) && (!booting))
+               {
+                       ServerInstance->Modes->DelMode(cp);
+                       ServerInstance->Modes->DelMode(cf);
+                       DELETE(cp);
+                       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.");
+               }
        }
        
        virtual void OnUserJoin(userrec* user, chanrec* channel)
@@ -101,7 +361,7 @@ class ModuleChanProtect : public Module
                // the config option for it is set
                if (FirstInGetsFounder)
                {
-                       if (Srv->CountUsers(channel) == 1)
+                       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
@@ -111,11 +371,8 @@ class ModuleChanProtect : public Module
                                // 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));
-                               }
+                               user->WriteServ("MODE %s +q %s",channel->name,user->nick);
+                               user->Extend("cm_founder_"+std::string(channel->name),fakevalue);
                        }
                }
        }
@@ -125,7 +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.
-       
                // don't allow action if:
                // (A) Theyre founder (no matter what)
                // (B) Theyre protected, and you're not
@@ -135,65 +391,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)) || (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);
 
                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,dummyptr))
                                {
-                                       Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as the're a channel founder");
+                                       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;
                                }
-                               if ((dest->GetExt("cm_protect_"+std::string(channel->name))) && (!source->GetExt("cm_protect_"+std::string(channel->name))))
+                               if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
                                {
-                                       Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as the're protected (+a)");
+                                       source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(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,dummyptr))
                                {
-                                       Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as the're a channel 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");
                                        return ACR_DENY;
                                }
-                               if ((dest->GetExt("cm_protect_"+std::string(channel->name))) && (!source->GetExt("cm_protect_"+std::string(channel->name))))
+                               if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
                                {
-                                       Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as the're protected (+a)");
+                                       source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(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,dummyptr))
                                {
-                                       Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as the're a channel 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");
                                        return ACR_DENY;
                                }
-                               if ((dest->GetExt("cm_protect_"+std::string(channel->name))) && (!source->GetExt("cm_protect_"+std::string(channel->name))))
+                               if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
                                {
-                                       Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as the're protected (+a)");
+                                       source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(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,dummyptr))
                                {
-                                       Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as the're a channel 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");
                                        return ACR_DENY;
                                }
-                               if ((dest->GetExt("cm_protect_"+std::string(channel->name))) && (!source->GetExt("cm_protect_"+std::string(channel->name))))
+                               if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
                                {
-                                       Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as the're protected (+a)");
+                                       source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're protected (+a)");
                                        return ACR_DENY;
                                }
                        break;
@@ -203,157 +460,53 @@ class ModuleChanProtect : public Module
                return ACR_DEFAULT;
        }
        
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-       {
-               // not out mode, bail
-               if ((modechar == 'q') && (type == MT_CHANNEL))
-               {
-                       // set up parameters
-                       chanrec* chan = (chanrec*)target;
-                       userrec* theuser = Srv->FindNick(params[0]);
-               
-                       // cant find the user given as the parameter, eat the mode change.
-                       if (!theuser)
-                               return -1;
-                       
-                       // given user isnt even on the channel, eat the mode change
-                       if (!Srv->IsOnChannel(theuser,chan))
-                               return -1;
-                       
-                       // source is a server, or ulined, we'll let them +-q the user.
-                       if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"")))
-                       {
-                               if (mode_on)
-                               {
-                                       if (!theuser->GetExt("cm_founder_"+std::string(chan->name)))
-                                       {
-                                               theuser->Extend("cm_founder_"+std::string(chan->name),fakevalue);
-                                               return 1;
-                                       }
-                               }
-                               else
-                               {
-                                       if (theuser->GetExt("cm_founder_"+std::string(chan->name)))
-                                       {
-                                               theuser->Shrink("cm_founder_"+std::string(chan->name));
-                                               return 1;
-                                       }
-                               }       
-
-                               return -1;
-                       }
-                       else
-                       {
-                               // whoops, someones being naughty!
-                               WriteServ(user->fd,"468 %s %s :Only servers may set channel mode +q",user->nick, chan->name);
-                               return -1;
-                       }
-               }
-               if ((modechar == 'a') && (type == MT_CHANNEL))
-               {
-                       // set up parameters
-                       chanrec* chan = (chanrec*)target;
-                       userrec* theuser = Srv->FindNick(params[0]);
-               
-                       // cant find the user given as the parameter, eat the mode change.
-                       if (!theuser)
-                               return -1;
-                       
-                       // given user isnt even on the channel, eat the mode change
-                       if (!Srv->IsOnChannel(theuser,chan))
-                               return -1;
-
-                       // source has +q, is a server, or ulined, we'll let them +-a the user.
-                       if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"")) || (user->GetExt("cm_founder_"+std::string(chan->name))))
-                       {
-                               if (mode_on)
-                               {
-                                       if (!theuser->GetExt("cm_protect_"+std::string(chan->name)))
-                                       {
-                                               theuser->Extend("cm_protect_"+std::string(chan->name),fakevalue);
-                                               return 1;
-                                       }
-                               }
-                               else
-                               {
-                                       if (theuser->GetExt("cm_protect_"+std::string(chan->name)))
-                                       {
-                                               theuser->Shrink("cm_protect_"+std::string(chan->name));
-                                               return 1;
-                                       }
-                               }       
-
-                               return -1;
-                       }
-                       else
-                       {
-                               // bzzzt, wrong answer!
-                               WriteServ(user->fd,"482 %s %s :You are not a channel founder",user->nick, chan->name);
-                               return -1;
-                       }
-               }
-               return 0;
-       }
-
-       virtual void OnSendList(userrec* user, chanrec* channel, char mode)
-       {
-               if (mode == 'q')
-               {
-                       chanuserlist cl = Srv->GetUsers(channel);
-                       for (int i = 0; i < cl.size(); i++)
-                       {
-                               if (cl[i]->GetExt("cm_founder_"+std::string(channel->name)))
-                               {
-                                       WriteServ(user->fd,"386 %s %s %s",user->nick, channel->name,cl[i]->nick);
-                               }
-                       }
-                       WriteServ(user->fd,"387 %s %s :End of channel founder list",user->nick, channel->name);
-               }
-                if (mode == 'a')
-                {
-                        chanuserlist cl = Srv->GetUsers(channel);
-                        for (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);
-                }
-
-       }
-       
        virtual ~ModuleChanProtect()
        {
-               delete Conf;
-               delete Srv;
+               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);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
-       virtual string_list OnChannelSync(chanrec* chan)
+       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 (int i = 0; i < cl.size(); i++)
+               /* NOTE: If +qa prefix is on, this is propogated by the channel join,
+                * so we dont need to propogate it manually
+                */
+               if (!QAPrefixes)
                {
-                       if (cl[i]->GetExt("cm_founder_"+std::string(chan->name)))
+                       // 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);
+                       irc::modestacker modestack(true);
+                       std::deque<std::string> stackresult;
+                       for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
                        {
-                               commands.push_back("M "+std::string(chan->name)+" +q "+std::string(cl[i]->nick));
+                               if (i->second->GetExt(founder,dummyptr))
+                               {
+                                       modestack.Push('q',i->second->nick);
+                               }
+                               if (i->second->GetExt(protect,dummyptr))
+                               {
+                                       modestack.Push('a',i->second->nick);
+                               }
                        }
-                       if (cl[i]->GetExt("cm_protect_"+std::string(chan->name)))
+                       while (modestack.GetStackedLine(stackresult))
                        {
-                               commands.push_back("M "+std::string(chan->name)+" +a "+std::string(cl[i]->nick));
+                               irc::stringjoiner mode_join(" ", stackresult, 0, stackresult.size() - 1);
+                               std::string line = mode_join.GetJoined();
+                               proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan, line);
                        }
                }
-               return commands;
        }
 
 };
@@ -370,9 +523,9 @@ class ModuleChanProtectFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(InspIRCd* Me)
        {
-               return new ModuleChanProtect;
+               return new ModuleChanProtect(Me);
        }
        
 };
@@ -382,4 +535,3 @@ extern "C" void * init_module( void )
 {
        return new ModuleChanProtectFactory;
 }
-