]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_chanprotect.cpp
Fix these too!
[user/henk/code/inspircd.git] / src / modules / m_chanprotect.cpp
index d4894c7656a5682f6d62b1e0cf5575f0c923bd25..060f81eb9add0d68962ff38b67383d78456ca091 100644 (file)
@@ -20,6 +20,7 @@
 #include "inspircd.h"
 
 /* $ModDesc: Provides channel modes +a and +q */
+/* $ModDep: ../../include/u_listmode.h */
 
 #define PROTECT_VALUE 40000
 #define FOUNDER_VALUE 50000
@@ -32,6 +33,8 @@ const char* fakevalue = "on";
  */
 bool unload_kludge = false;
 
+/** Handles basic operation of +qa channel modes
+ */
 class FounderProtectBase
 {
  private:
@@ -75,19 +78,30 @@ class FounderProtectBase
        {
                unload_kludge = true;
                CUList* cl = channel->GetUsers();
-               std::string item = extend+std::string(channel->name);
-               char moderemove[MAXBUF];
+               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))
                        {
-                               sprintf(moderemove,"-%c",mc);
-                               const char* parameters[] = { channel->name, moderemove, i->second->nick };
-                               MyInstance->SendMode(parameters, 3, n);
+                               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;
        }
@@ -143,6 +157,8 @@ class FounderProtectBase
        }
 };
 
+/** Abstraction of FounderProtectBase for channel mode +q
+ */
 class ChanFounder : public ModeHandler, public FounderProtectBase
 {
        char* dummyptr;
@@ -199,6 +215,8 @@ class ChanFounder : public ModeHandler, public FounderProtectBase
        }
 };
 
+/** Abstraction of FounderProtectBase for channel mode +a
+ */
 class ChanProtect : public ModeHandler, public FounderProtectBase
 {
        char* dummyptr;
@@ -260,6 +278,7 @@ class ModuleChanProtect : public Module
        
        bool FirstInGetsFounder;
        bool QAPrefixes;
+       bool booting;
        ChanProtect* cp;
        ChanFounder* cf;
        char* dummyptr;
@@ -269,7 +288,9 @@ class ModuleChanProtect : public Module
        ModuleChanProtect(InspIRCd* Me) : Module::Module(Me)
        {       
                /* Load config stuff */
+               booting = true;
                OnRehash("");
+               booting = false;
 
                /* Initialise module variables */
 
@@ -307,9 +328,28 @@ class ModuleChanProtect : public Module
                 * stack-allocate it locally.
                 */
                ConfigReader Conf(ServerInstance);
+
+               bool old_qa = QAPrefixes;
                
                FirstInGetsFounder = Conf.ReadFlag("options","noservices",0);
                QAPrefixes = Conf.ReadFlag("options","qaprefixes",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);
+                       cf = new ChanFounder(ServerInstance,QAPrefixes);
+                       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)
@@ -355,6 +395,7 @@ class ModuleChanProtect : public Module
                // without any access checks, we're not worthy :p
                if ((ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server))
                {
+                       ServerInstance->Log(DEBUG,"chanprotect OnAccessCheck returns ALLOW");
                        return ACR_ALLOW;
                }
 
@@ -428,6 +469,7 @@ class ModuleChanProtect : public Module
                }
                
                // we dont know what this access check is, or dont care. just carry on, nothing to see here.
+               ServerInstance->Log(DEBUG,"chanprotect OnAccessCheck returns DEFAULT");
                return ACR_DEFAULT;
        }
        
@@ -441,27 +483,41 @@ class ModuleChanProtect : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
        virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
        {
-               // this is called when the server is linking into a net and wants to sync channel data.
-               // we should send our mode changes for the channel here to ensure that other servers
-               // know whos +q/+a on the channel.
-               CUList* cl = chan->GetUsers();
-               string_list commands;
-               std::string founder = "cm_founder_"+std::string(chan->name);
-               std::string protect = "cm_protect_"+std::string(chan->name);
-               for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
+               /* NOTE: If +qa prefix is on, this is propogated by the channel join,
+                * so we dont need to propogate it manually
+                */
+               if (!QAPrefixes)
                {
-                       if (i->second->GetExt(founder,dummyptr))
+                       // 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++)
                        {
-                               proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+q "+std::string(i->second->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 (i->second->GetExt(protect,dummyptr))
+                       while (modestack.GetStackedLine(stackresult))
                        {
-                               proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+a "+std::string(i->second->nick));
+                               irc::stringjoiner mode_join(" ", stackresult, 0, stackresult.size() - 1);
+                               std::string line = mode_join.GetJoined();
+                               proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan, line);
                        }
                }
        }