]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_chanprotect.cpp
Merge pull request #1018 from SaberUK/insp20+hidekills
[user/henk/code/inspircd.git] / src / modules / m_chanprotect.cpp
index 68a4afb9f2cb5fdfe6ab4c1a1b7cf3b5d1a4c0e6..affd0c8d674324649a674af542da9834a85ccf2f 100644 (file)
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- 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.
- * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2006-2009 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2004-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 John Brooks <john.brooks@dereferenced.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
- * ---------------------------------------------------
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
-#include "commands.h"
 
 /* $ModDesc: Provides channel modes +a and +q */
 
+#define PROTECT_VALUE 40000
+#define FOUNDER_VALUE 50000
 
+struct ChanProtectSettings
+{
+       bool DeprivSelf;
+       bool DeprivOthers;
+       bool FirstInGetsFounder;
+       bool booting;
+       ChanProtectSettings() : booting(true) {}
+};
 
-const char* fakevalue = "on";
+static ChanProtectSettings settings;
 
-class ChanFounder : public ModeHandler
+/** Handles basic operation of +qa channel modes
+ */
+class FounderProtectBase
 {
-       char* dummyptr;
+ private:
+       const std::string type;
+       const char mode;
+       const int list;
+       const int end;
  public:
-       ChanFounder(InspIRCd* Instance) : ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false) { }
-
-       ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+       FounderProtectBase(char Mode, const std::string &mtype, int l, int e) :
+               type(mtype), mode(Mode), list(l), end(e)
        {
-               userrec* x = ServerInstance->FindNick(parameter);
-               if (x)
-               {
-                       if (!channel->HasUser(x))
-                       {
-                               return std::make_pair(false, parameter);
-                       }
-                       else
-                       {
-                               std::string founder = "cm_founder_"+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);
        }
 
-
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       void RemoveMode(Channel* channel, irc::modestacker* stack)
        {
-               userrec* theuser = ServerInstance->FindNick(parameter);
+               const UserMembList* cl = channel->GetUsers();
+               std::vector<std::string> mode_junk;
+               mode_junk.push_back(channel->name);
+               irc::modestacker modestack(false);
+               std::deque<std::string> stackresult;
 
-               ServerInstance->Log(DEBUG,"ChanFounder::OnModeChange");
-
-               // cant find the user given as the parameter, eat the mode change.
-               if (!theuser)
+               for (UserMembCIter i = cl->begin(); i != cl->end(); i++)
                {
-                       ServerInstance->Log(DEBUG,"No such user in ChanFounder");
-                       parameter = "";
-                       return MODEACTION_DENY;
-               }
-
-               // given user isnt even on the channel, eat the mode change
-               if (!channel->HasUser(theuser))
-               {
-                       ServerInstance->Log(DEBUG,"Channel doesn't have user in ChanFounder");
-                       parameter = "";
-                       return MODEACTION_DENY;
-               }
-
-               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)))
-               {
-                       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->second->hasMode(mode))
                        {
-                               if (theuser->GetExt(founder, dummyptr))
-                               {
-                                       theuser->Shrink(founder);
-                                       // Tidy the nickname (make case match etc)
-                                       parameter = theuser->nick;
-                                       return MODEACTION_ALLOW;
-                               }
+                               if (stack)
+                                       stack->Push(mode, i->first->nick);
+                               else
+                                       modestack.Push(mode, i->first->nick);
                        }
-                       return MODEACTION_DENY;
                }
-               else
+
+               if (stack)
+                       return;
+
+               while (modestack.GetStackedLine(stackresult))
                {
-                       // whoops, someones being naughty!
-                       source->WriteServ("468 %s %s :Only servers may set channel mode +q",source->nick, channel->name);
-                       parameter = "";
-                       return MODEACTION_DENY;
+                       mode_junk.insert(mode_junk.end(), stackresult.begin(), stackresult.end());
+                       ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient);
+                       mode_junk.erase(mode_junk.begin() + 1, mode_junk.end());
                }
        }
 
-       void DisplayList(userrec* user, chanrec* channel)
+       void DisplayList(User* user, Channel* channel)
        {
-               CUList* cl = channel->GetUsers();
-               std::string founder = "cm_founder_"+std::string(channel->name);
-               for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
+               const UserMembList* cl = channel->GetUsers();
+               for (UserMembCIter i = cl->begin(); i != cl->end(); ++i)
                {
-                       if (i->second->GetExt(founder, dummyptr))
+                       if (i->second->hasMode(mode))
                        {
-                               user->WriteServ("386 %s %s %s",user->nick, channel->name,i->second->nick);
+                               user->WriteServ("%d %s %s %s", list, user->nick.c_str(), channel->name.c_str(), i->first->nick.c_str());
                        }
                }
-               user->WriteServ("387 %s %s :End of channel founder list",user->nick, channel->name);
+               user->WriteServ("%d %s %s :End of channel %s list", end, user->nick.c_str(), channel->name.c_str(), type.c_str());
        }
 
+       bool CanRemoveOthers(User* u1, Channel* c)
+       {
+               Membership* m1 = c->GetUser(u1);
+               return (settings.DeprivOthers && m1 && m1->hasMode(mode));
+       }
 };
 
-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) { }
-
-       ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+       ChanFounder(Module* Creator)
+               : ModeHandler(Creator, "founder", 'q', PARAM_ALWAYS, MODETYPE_CHANNEL),
+                 FounderProtectBase('q', "founder", 386, 387)
        {
-               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);
+               ModeHandler::list = true;
+               levelrequired = FOUNDER_VALUE;
+               m_paramtype = TR_NICK;
        }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       void setPrefix(int pfx)
        {
-               userrec* theuser = ServerInstance->FindNick(parameter);
+               prefix = pfx;
+       }
 
-               // cant find the user given as the parameter, eat the mode change.
-               if (!theuser)
-               {
-                       parameter = "";
-                       return MODEACTION_DENY;
-               }
+       unsigned int GetPrefixRank()
+       {
+               return FOUNDER_VALUE;
+       }
 
-               // given user isnt even on the channel, eat the mode change
-               if (!channel->HasUser(theuser))
-               {
-                       parameter = "";
-                       return MODEACTION_DENY;
-               }
+       void RemoveMode(Channel* channel, irc::modestacker* stack)
+       {
+               FounderProtectBase::RemoveMode(channel, stack);
+       }
 
-               std::string protect = "cm_protect_"+std::string(channel->name);
-               std::string founder = "cm_founder_"+std::string(channel->name);
+       void RemoveMode(User* user, irc::modestacker* stack)
+       {
+       }
+       
+       ModResult AccessCheck(User* source, Channel* channel, std::string &parameter, bool adding)
+       {
+               User* theuser = ServerInstance->FindNick(parameter);
+               // remove own privs?
+               if (source == theuser && !adding && settings.DeprivSelf)
+                       return MOD_RES_ALLOW;
 
-               // 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 (!adding && FounderProtectBase::CanRemoveOthers(source, channel))
                {
-                       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 MOD_RES_PASSTHRU;
                }
                else
                {
-                       // bzzzt, wrong answer!
-                       source->WriteServ("482 %s %s :You are not a channel founder",source->nick, channel->name);
-                       return MODEACTION_DENY;
+                       source->WriteNumeric(468, "%s %s :Only servers may set channel mode +q", source->nick.c_str(), channel->name.c_str());
+                       return MOD_RES_DENY;
                }
        }
 
-       virtual void DisplayList(userrec* user, chanrec* channel)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
-               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);
+               return MODEACTION_ALLOW;
        }
 
+       void DisplayList(User* user, Channel* channel)
+       {
+               FounderProtectBase::DisplayList(user,channel);
+       }
 };
 
-class ModuleChanProtect : public Module
+/** Abstraction of FounderProtectBase for channel mode +a
+ */
+class ChanProtect : public ModeHandler, public FounderProtectBase
 {
-       
-       bool FirstInGetsFounder;
-       ChanProtect* cp;
-       ChanFounder* cf;
-       char* dummyptr;
-       
  public:
-       ModuleChanProtect(InspIRCd* Me) : Module::Module(Me)
-       {       
-               /* Initialise module variables */
-
-               cp = new ChanProtect(ServerInstance);
-               cf = new ChanFounder(ServerInstance);
-
-               ServerInstance->AddMode(cp, 'a');
-               ServerInstance->AddMode(cf, 'q');
-               
-               /* Load config stuff */
-               OnRehash("");
-       }
-
-       void Implements(char* List)
+       ChanProtect(Module* Creator)
+               : ModeHandler(Creator, "admin", 'a', PARAM_ALWAYS, MODETYPE_CHANNEL),
+                 FounderProtectBase('a',"protected user", 388, 389)
        {
-               List[I_On005Numeric] = List[I_OnUserKick] = List[I_OnUserPart] = List[I_OnRehash] = List[I_OnUserJoin] = List[I_OnAccessCheck] = List[I_OnSyncChannel] = 1;
+               ModeHandler::list = true;
+               levelrequired = PROTECT_VALUE;
+               m_paramtype = TR_NICK;
        }
-       
-       virtual void On005Numeric(std::string &output)
+
+       void setPrefix(int pfx)
        {
-               ServerInstance->ModeGrok->InsertMode(output,"qa",1);
+               prefix = pfx;
        }
 
-       virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason)
+
+       unsigned int GetPrefixRank()
        {
-               // 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));
+               return PROTECT_VALUE;
        }
 
-       virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partreason)
+       void RemoveMode(Channel* channel, irc::modestacker* stack)
        {
-               // 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));
+               FounderProtectBase::RemoveMode(channel, stack);
        }
 
-       virtual void OnRehash(const std::string &parameter)
+       void RemoveMode(User* user, irc::modestacker* stack)
        {
-               /* 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);
        }
-       
-       virtual void OnUserJoin(userrec* user, chanrec* channel)
+
+       ModResult AccessCheck(User* source, Channel* channel, std::string &parameter, bool adding)
        {
-               // 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)
+               User* theuser = ServerInstance->FindNick(parameter);
+               // source has +q
+               if (channel->GetPrefixValue(source) > PROTECT_VALUE)
+                       return MOD_RES_ALLOW;
+
+               // removing own privs?
+               if (source == theuser && !adding && settings.DeprivSelf)
+                       return MOD_RES_ALLOW;
+
+               if (!adding && FounderProtectBase::CanRemoveOthers(source, channel))
                {
-                       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));
-                               }
-                       }
+                       return MOD_RES_PASSTHRU;
                }
-       }
-       
-       virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* 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
-               // 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))
+               else
                {
-                       return ACR_ALLOW;
+                       source->WriteNumeric(482, "%s %s :You are not a channel founder", source->nick.c_str(), channel->name.c_str());
+                       return MOD_RES_DENY;
                }
+       }
 
-               std::string founder = "cm_founder_"+std::string(channel->name);
-               std::string protect = "cm_protect_"+std::string(channel->name);
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       {
+               return MODEACTION_ALLOW;
+       }
 
-               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))
-                               {
-                                       ServerInstance->Log(DEBUG,"Has %s",founder.c_str());
-                                       source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're a channel founder");
-                                       return ACR_DENY;
-                               }
-                               else
-                               {
-                                       ServerInstance->Log(DEBUG,"Doesnt have %s",founder.c_str());
-                               }
-                               if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
-                               {
-                                       source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're protected (+a)");
-                                       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))
-                               {
-                                       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(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
-                               {
-                                       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(founder,dummyptr))
-                               {
-                                       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(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
-                               {
-                                       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(founder,dummyptr))
-                               {
-                                       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(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
-                               {
-                                       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;
-               }
-               
-               // we dont know what this access check is, or dont care. just carry on, nothing to see here.
-               return ACR_DEFAULT;
+       void DisplayList(User* user, Channel* channel)
+       {
+               FounderProtectBase::DisplayList(user, channel);
        }
-       
-       virtual ~ModuleChanProtect()
+
+};
+
+class ModuleChanProtect : public Module
+{
+       ChanProtect cp;
+       ChanFounder cf;
+ public:
+       ModuleChanProtect() : cp(this), cf(this)
        {
-               DELETE(cp);
-               DELETE(cf);
        }
-       
-       virtual Version GetVersion()
+
+       void init()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               /* Load config stuff */
+               LoadSettings();
+               settings.booting = false;
+
+               ServerInstance->Modules->AddService(cf);
+               ServerInstance->Modules->AddService(cp);
+
+               Implementation eventlist[] = { I_OnUserPreJoin };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
-       
-       virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+
+       void LoadSettings()
        {
-               // 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++)
+               ConfigTag* tag = ServerInstance->Config->ConfValue("chanprotect");
+
+               settings.FirstInGetsFounder = tag->getBool("noservices");
+
+               std::string qpre = tag->getString("qprefix");
+               char QPrefix = qpre.empty() ? 0 : qpre[0];
+
+               std::string apre = tag->getString("aprefix");
+               char 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 (settings.booting)
                {
-                       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));
-                       }
+                       if (APrefix && ServerInstance->Modes->FindPrefix(APrefix) && ServerInstance->Modes->FindPrefix(APrefix) != &cp)
+                               throw ModuleException("Looks like the +a prefix you picked for m_chanprotect is already in use. Pick another.");
+
+                       if (QPrefix && ServerInstance->Modes->FindPrefix(QPrefix) && ServerInstance->Modes->FindPrefix(QPrefix) != &cf)
+                               throw ModuleException("Looks like the +q prefix you picked for m_chanprotect is already in use. Pick another.");
+
+                       cp.setPrefix(APrefix);
+                       cf.setPrefix(QPrefix);
                }
+               settings.DeprivSelf = tag->getBool("deprotectself", true);
+               settings.DeprivOthers = tag->getBool("deprotectothers", true);
        }
 
-};
+       ModResult 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 (settings.FirstInGetsFounder && !chan)
+                       privs += 'q';
 
-class ModuleChanProtectFactory : public ModuleFactory
-{
- public:
-       ModuleChanProtectFactory()
-       {
+               return MOD_RES_PASSTHRU;
        }
-       
-       ~ModuleChanProtectFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
+
+       Version GetVersion()
        {
-               return new ModuleChanProtect(Me);
+               return Version("Founder and Protect modes (+qa)", VF_VENDOR);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleChanProtectFactory;
-}
+MODULE_INIT(ModuleChanProtect)